diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-02-07 10:56:45 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-02-07 13:48:59 +0000 |
| commit | 8096b9f52476b119e61c8b5809535ad865b5e362 (patch) | |
| tree | c14cbd2bc1c41bf774f84b23ebba0cddffeb62f3 /qbs | |
| parent | 78cf3eb671abd802d7d0f693b7d0cf956de4de06 (diff) | |
| download | qt-creator-8096b9f52476b119e61c8b5809535ad865b5e362.tar.gz | |
Update qbs submodule to HEAD of 2.0 branch
Change-Id: If53431a0cf8bf412a28e606b0712e0acb26e07f5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs index d3b2cafa1c..eca4f33508 100644 --- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -6,15 +6,21 @@ Module { Depends { name: "cpp" } Properties { - condition: qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang") - && Utilities.versionCompare(cpp.compilerVersion, "9") >= 0 - cpp.cxxFlags: ["-Wno-deprecated-copy", "-Wno-init-list-lifetime"] - } - - Properties { - condition: qbs.toolchain.contains("clang") && !qbs.hostOS.contains("darwin") - && Utilities.versionCompare(cpp.compilerVersion, "10") >= 0 - cpp.cxxFlags: ["-Wno-deprecated-copy", "-Wno-constant-logical-operand"] + condition: qbs.toolchain.contains("gcc") + cpp.cxxFlags: { + var flags = ["-Wno-missing-field-initializers"]; + function isClang() { return qbs.toolchain.contains("clang"); } + function versionAtLeast(v) { + return Utilities.versionCompare(cpp.compilerVersion, v) >= 0; + }; + if (isClang()) + flags.push("-Wno-constant-logical-operand"); + if ((!isClang() && versionAtLeast("9")) + || (isClang() && !qbs.hostOS.contains("darwin") && versionAtLeast("10"))) { + flags.push("-Wno-deprecated-copy"); + } + return flags; + } } priority: 1 |