feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qbs build: Suppress some warnings

Browse Source 
Like in the qmake build.

Change-Id: I7dc4a42bf3e4394a4fb6a579646d806f80fa3e96
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2018-01-19 13:23:47 +01:00
parent 56157f739d
commit 51ddd4bcfd
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qbs/imports/QtcProduct.qbs
View File

@@ -31,6 +31,10 @@ Product {
condition: qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang") condition: qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang")
cpp.cxxFlags: base.concat(["-Wno-noexcept-type"]) cpp.cxxFlags: base.concat(["-Wno-noexcept-type"])
} }
Properties {
condition: qbs.toolchain.contains("msvc")
cpp.cxxFlags: base.concat(["/w44996"])
}
cpp.cxxLanguageVersion: "c++14" cpp.cxxLanguageVersion: "c++14"
cpp.defines: qtc.generalDefines cpp.defines: qtc.generalDefines
cpp.minimumWindowsVersion: qbs.architecture === "x86" ? "5.1" : "5.2" cpp.minimumWindowsVersion: qbs.architecture === "x86" ? "5.1" : "5.2"

1
qbs/modules/qtc/qtc.qbs
View File

@@ -85,6 +85,7 @@ Module {
"QT_USE_FAST_OPERATOR_PLUS", "QT_USE_FAST_OPERATOR_PLUS",
"QT_USE_FAST_CONCATENATION", "QT_USE_FAST_CONCATENATION",
].concat(testsEnabled ? ["WITH_TESTS"] : []) ].concat(testsEnabled ? ["WITH_TESTS"] : [])
.concat(qbs.toolchain.contains("msvc") ? ["_CRT_SECURE_NO_WARNINGS"] : [])
Rule { Rule {
condition: make_dev_package condition: make_dev_package