diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-19 13:23:47 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-19 14:36:44 +0000 |
| commit | 51ddd4bcfda39ac7acc2dabfd78494b8cdf839e8 (patch) | |
| tree | 8dea7a77cbf8d59bab0185eb3e81a50a2028d16a /qbs | |
| parent | 56157f739d8547c0abf1500ef3a696531f3e9338 (diff) | |
qbs build: Suppress some warnings
Like in the qmake build.
Change-Id: I7dc4a42bf3e4394a4fb6a579646d806f80fa3e96
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 4 | ||||
| -rw-r--r-- | qbs/modules/qtc/qtc.qbs | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index ef19ce4987..2aebb244f2 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -31,6 +31,10 @@ Product { 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.cxxLanguageVersion: "c++14" cpp.defines: qtc.generalDefines cpp.minimumWindowsVersion: qbs.architecture === "x86" ? "5.1" : "5.2" diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index a710ad05ab..9a669ccfc0 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -85,6 +85,7 @@ Module { "QT_USE_FAST_OPERATOR_PLUS", "QT_USE_FAST_CONCATENATION", ].concat(testsEnabled ? ["WITH_TESTS"] : []) + .concat(qbs.toolchain.contains("msvc") ? ["_CRT_SECURE_NO_WARNINGS"] : []) Rule { condition: make_dev_package |