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/imports/QtcProduct.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/imports/QtcProduct.qbs')
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 1 |
1 files changed, 1 insertions, 0 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"); |