diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-12 09:59:55 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-12 09:59:55 +0200 |
| commit | c9b56717542749b271d5e48c7bf7698884e94f8f (patch) | |
| tree | 424aabcf1197798d2294cb05eb047d51c4f82bce /qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | |
| parent | 6ab2f93f184470998e452cd709a881258dfef6a0 (diff) | |
| parent | 8e1169f4bf6fc97f7f864cefeb5a273f271798cf (diff) | |
Merge remote-tracking branch 'origin/4.12' into qds-1.50qds/v1.5.0-rc1
Change-Id: Iee9542b518367018b6e672ff920bfdb411639f8b
Diffstat (limited to 'qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs')
| -rw-r--r-- | qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | 8 |
1 files changed, 7 insertions, 1 deletions
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 |