From 29bf17dee1497972152566af6916fd0a20b784ee Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Wed, 22 Mar 2017 11:06:46 +0100
Subject: Fix build with GCC 7

GCC 7 warns about preprocessor macros expanding to defined(),
which the masm config macros use pervasively.

Fix by suppressing the warning (-Wexpansion-to-defined).

Task-number: QTBUG-59647
Change-Id: I9220741cf594824472bffc2305b994b311e55832
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/3rdparty/masm/masm-defs.pri | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/3rdparty')

diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri
index fa0d3d3c55..c0c5f3d114 100644
--- a/src/3rdparty/masm/masm-defs.pri
+++ b/src/3rdparty/masm/masm-defs.pri
@@ -40,3 +40,10 @@ INCLUDEPATH += $$PWD/disassembler/udis86
 INCLUDEPATH += $$_OUT_PWD
 
 CONFIG(release, debug|release): DEFINES += NDEBUG
+
+!intel_icc:!clang:gcc {
+    greaterThan(QT_GCC_MAJOR_VERSION, 6) { # GCC 7
+        QMAKE_CXXFLAGS_WARN_ON += -Wno-expansion-to-defined
+        QMAKE_CXXFLAGS += -Wno-expansion-to-defined
+    }
+}
-- 
cgit v1.2.3