diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-05-11 11:38:33 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-05-12 07:31:39 +0000 |
| commit | 8e1169f4bf6fc97f7f864cefeb5a273f271798cf (patch) | |
| tree | 424baf1ceb4a3fe7dddf9a0ba91840552c14955c | |
| parent | 99b66f62385f46118476d681e85e6e06cbfad64a (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>
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 1 | ||||
| -rw-r--r-- | tests/auto/extensionsystem/plugin.qbs | 1 |
2 files changed, 2 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"); diff --git a/tests/auto/extensionsystem/plugin.qbs b/tests/auto/extensionsystem/plugin.qbs index 446dc250c7..68e259fafd 100644 --- a/tests/auto/extensionsystem/plugin.qbs +++ b/tests/auto/extensionsystem/plugin.qbs @@ -15,6 +15,7 @@ DynamicLibrary { 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"); |