diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-09-18 15:46:08 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-09-19 09:56:39 +0000 |
| commit | d00d056b320608a4e3425e9f2b5da7e749497934 (patch) | |
| tree | 9d5bc1d8695c9d121996c9de5baa00c745432e08 /qbs | |
| parent | 621902d48597435eadca2de76a2a579bf21cc4da (diff) | |
qbs build: Remove compatibility code for outdated qbs versions
Change-Id: I2667e0e76dbcf692a25a5d4d5f020ac90f0be478
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/pluginjson/pluginjson.qbs | 3 | ||||
| -rw-r--r-- | qbs/modules/qtc/qtc.qbs | 12 |
2 files changed, 1 insertions, 14 deletions
diff --git a/qbs/modules/pluginjson/pluginjson.qbs b/qbs/modules/pluginjson/pluginjson.qbs index 9a200cf83f..43d5e7f001 100644 --- a/qbs/modules/pluginjson/pluginjson.qbs +++ b/qbs/modules/pluginjson/pluginjson.qbs @@ -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 diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 7a6a2a9de8..73b26adf9e 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -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' @@ -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-" - } } |