From 954664d8d8600294678ca0df6620d213c6d46fd8 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 2 Jul 2019 14:33:20 +0200 Subject: qbs build: Fix GCC 9 warnings triggered by Qt headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7795cb20d7af1c5fd46d8cdbdc3fa46cad5963bb Reviewed-by: Qbs CI Bot Reviewed-by: Jörg Bornemann --- qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs index bcdf4efd2..c2db0189f 100644 --- a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -1,5 +1,6 @@ import qbs import qbs.FileInfo +import qbs.Utilities Module { Depends { @@ -47,8 +48,17 @@ Module { "share/qbs/qml-type-descriptions") Properties { - condition: project.withCode && enableAddressSanitizer && qbs.toolchain.contains("gcc") - cpp.cxxFlags: "-fno-omit-frame-pointer" - cpp.driverFlags: "-fsanitize=address" + condition: project.withCode && qbs.toolchain.contains("gcc") + cpp.cxxFlags: { + var flags = []; + if (enableAddressSanitizer) + flags.push("-fno-omit-frame-pointer"); + if (!qbs.toolchain.contains("clang") + && Utilities.versionCompare(cpp.compilerVersion, "9") >= 0) { + flags.push("-Wno-deprecated-copy", "-Wno-init-list-lifetime"); + } + return flags; + } + cpp.driverFlags: enableAddressSanitizer ? ["-fsanitize=address"] : [] } } -- cgit v1.2.3