From b21d0485d04c0ae24526a534b40abd5d549c8595 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Fri, 5 Jul 2019 14:52:55 +0200
Subject: qbs build: Suppress GCC 9 warnings also in qbs submodule

Amends 7b2d41a972.

Change-Id: I3500b57fa2424f522ffe16e5413a7593601215c0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'qbs')

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
-- 
cgit v1.2.3