diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-05-15 14:49:11 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-05-15 14:49:11 +0200 |
| commit | 52b7ec058b4cd18b1da3944c1e69a583a56aba63 (patch) | |
| tree | 63a641735dee9e94363c16a6b9833f5e2ea8beb8 /qbs | |
| parent | 7414a47825895ac8a779911e3d641d782686b6c9 (diff) | |
| parent | 921b56cd468b14f322cbb9e9441f1e32326b0b46 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
src/plugins/mcusupport/mcusupportsdk.cpp
Change-Id: I1583fa81adc0218ad4657baa347c08e9e29f88e6
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 1 | ||||
| -rw-r--r-- | qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index 38ac963183..206b5c2ada 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -37,6 +37,7 @@ Product { cpp.cxxFlags: { var flags = []; if (qbs.toolchain.contains("clang") + && !qbs.hostOS.contains("darwin") && Utilities.versionCompare(cpp.compilerVersion, "10") >= 0) { // Triggers a lot in Qt. flags.push("-Wno-deprecated-copy", "-Wno-constant-logical-operand"); diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs index f44aa86af4..d3b2cafa1c 100644 --- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -1,5 +1,5 @@ -import qbs import qbs.FileInfo +import qbs.Utilities Module { Depends { name: "qtc" } @@ -11,6 +11,12 @@ Module { 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"] + } + priority: 1 property bool enableUnitTests: false |