diff options
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 862c824743..d96c096f8f 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 |