diff options
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" |