aboutsummaryrefslogtreecommitdiffstats
path: root/qbs
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2020-05-11 11:38:33 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2020-05-12 07:31:39 +0000
commit8e1169f4bf6fc97f7f864cefeb5a273f271798cf (patch)
tree424baf1ceb4a3fe7dddf9a0ba91840552c14955c /qbs
parent99b66f62385f46118476d681e85e6e06cbfad64a (diff)
qbs build: Take differences between clang and "apple clang" into account
In particular, clang with version number 10 is not really clang 10 on macOS. Change-Id: I8be489fa9cffd63c1ea8f13d181686ab1a575ec6 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'qbs')
-rw-r--r--qbs/imports/QtcProduct.qbs1
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");