From 050dec20dde89799533def3c88dc046fcc751ee4 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Thu, 7 May 2020 17:59:28 +0200
Subject: qbs build: Fix excessive clang 10 warnings for qbs submodule

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

(limited to 'qbs')

diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
index f44aa86af4..d3b2cafa1c 100644
--- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
+++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
@@ -1,5 +1,5 @@
-import qbs
 import qbs.FileInfo
+import qbs.Utilities
 
 Module {
     Depends { name: "qtc" }
@@ -11,6 +11,12 @@ Module {
         cpp.cxxFlags: ["-Wno-deprecated-copy", "-Wno-init-list-lifetime"]
     }
 
+    Properties {
+        condition: qbs.toolchain.contains("clang") && !qbs.hostOS.contains("darwin")
+                   && Utilities.versionCompare(cpp.compilerVersion, "10") >= 0
+        cpp.cxxFlags: ["-Wno-deprecated-copy", "-Wno-constant-logical-operand"]
+    }
+
     priority: 1
 
     property bool enableUnitTests: false
-- 
cgit v1.2.3