aboutsummaryrefslogtreecommitdiffstats
path: root/qbs
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-07-05 14:52:55 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2019-07-09 09:26:32 +0000
commitb21d0485d04c0ae24526a534b40abd5d549c8595 (patch)
treecaf800c3751d7b666e3d11d460668af47687505e /qbs
parent2f39838170924486ac4e93b3797ca2122ca5a78d (diff)
qbs build: Suppress GCC 9 warnings also in qbs submodule
Amends 7b2d41a972. Change-Id: I3500b57fa2424f522ffe16e5413a7593601215c0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'qbs')
-rw-r--r--qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs9
1 files changed, 8 insertions, 1 deletions
diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
index 4a0d6cab1d..f44aa86af4 100644
--- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
+++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
@@ -3,8 +3,15 @@ import qbs.FileInfo
Module {
Depends { name: "qtc" }
+ Depends { name: "cpp" }
- property bool priority: 1 // TODO: Remove declaration after 1.11 is out.
+ Properties {
+ condition: qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang")
+ && Utilities.versionCompare(cpp.compilerVersion, "9") >= 0
+ cpp.cxxFlags: ["-Wno-deprecated-copy", "-Wno-init-list-lifetime"]
+ }
+
+ priority: 1
property bool enableUnitTests: false
property bool enableProjectFileUpdates: true