diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2019-07-04 14:47:52 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2019-07-04 15:17:55 +0200 |
| commit | 1df6443d4a6e58338dfaed7d787debfaeba86756 (patch) | |
| tree | 29ceb6ea3313311287eb5b5216a8a49c1ec0ecfd /qbs | |
| parent | 2b7fab166878b759fc8fa29256754a41c3fc6259 (diff) | |
| parent | 6a58666f4403cdde1809784c1cc98668a4b02cfc (diff) | |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/libs/utils/synchronousprocess.cpp
src/plugins/baremetal/iarewtoolchain.cpp
src/plugins/cmakeprojectmanager/cmakeproject.cpp
tests/unit/unittest/CMakeLists.txt
Change-Id: I124ad492df403286751e175d27fe36487ddf6d07
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index a031474c29..e54dc667f4 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -34,14 +34,18 @@ Product { // because conflicting scalar values would be reported (QBS-1225 would fix that). cpp.minimumMacosVersion: project.minimumMacosVersion - Properties { - condition: qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang") - cpp.cxxFlags: base.concat(["-Wno-noexcept-type"]) - } - Properties { - condition: qbs.toolchain.contains("msvc") - cpp.cxxFlags: base.concat(["/w44996"]) + cpp.cxxFlags: { + var flags = []; + if (qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang")) { + flags.push("-Wno-noexcept-type"); + if (Utilities.versionCompare(cpp.compilerVersion, "9") >= 0) + flags.push("-Wno-deprecated-copy", "-Wno-init-list-lifetime"); + } else if (qbs.toolchain.contains("msvc")) { + flags.push("/w44996"); + } + return flags; } + cpp.cxxLanguageVersion: "c++14" cpp.defines: qtc.generalDefines cpp.minimumWindowsVersion: "6.1" |