Skip to content

Commit

Permalink
qbs build: Remove compatibility code for outdated qbs versions
Browse files Browse the repository at this point in the history
Change-Id: I2667e0e76dbcf692a25a5d4d5f020ac90f0be478
Reviewed-by: Christian Stenger <[email protected]>
  • Loading branch information
ckandeler committed Sep 19, 2023
1 parent 621902d commit d00d056
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 15 deletions.
3 changes: 1 addition & 2 deletions qbs/modules/pluginjson/pluginjson.qbs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ Module {
property var replacements

// TODO: Wrap the VCS specific stuff in a dedicated module
property bool hasVcs: Utilities.versionCompare(qbs.version, "1.10") >= 0
property bool useVcsData: hasVcs
property bool useVcsData: true
Depends { name: "vcs"; condition: useVcsData }
Properties {
condition: useVcsData
Expand Down
12 changes: 0 additions & 12 deletions qbs/modules/qtc/qtc.qbs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import qbs.FileInfo
import qbs.Utilities

Module {
Depends { name: "cpp"; required: false }

property string qtcreator_display_version: '12.0.0-beta1'
property string ide_version_major: '11'
property string ide_version_minor: '0'
Expand Down Expand Up @@ -92,14 +90,4 @@ Module {
"QT_USE_QSTRINGBUILDER",
].concat(testsEnabled ? ["WITH_TESTS"] : [])
.concat(qbs.toolchain.contains("msvc") ? ["_CRT_SECURE_NO_WARNINGS"] : [])
.concat((qbs.toolchain.contains("msvc") && Utilities.versionCompare(qbs.version, "1.23.2") < 0)
? ["_ENABLE_EXTENDED_ALIGNED_STORAGE"] : [])

Properties {
condition: cpp.present && qbs.toolchain.contains("msvc") && product.Qt
&& Utilities.versionCompare(product.Qt.core.version, "6.3") >= 0
&& Utilities.versionCompare(cpp.compilerVersion, "19.10") >= 0
&& Utilities.versionCompare(qbs.version, "1.23") < 0
cpp.cxxFlags: "/permissive-"
}
}
2 changes: 1 addition & 1 deletion qtcreator.qbs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import qbs.FileInfo

Project {
name: "Qt Creator"
minimumQbsVersion: "1.19.0"
minimumQbsVersion: "2.0.0"
property bool withAutotests: qbs.buildVariant === "debug"
property path ide_source_tree: path
property pathList additionalPlugins: []
Expand Down

0 comments on commit d00d056

Please sign in to comment.