diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2017-03-22 11:06:46 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-03-22 16:57:21 +0000 |
| commit | be66de89e49286d0812f6a7bee19dccbf03dcb88 (patch) | |
| tree | 4f3d29f271ada8504030eb8a9275ec963e59a9e0 /src | |
| parent | 8e26ddf986d4f4309063ad0d81947c0fa14a2574 (diff) | |
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>
(cherry picked from commit 29bf17dee1497972152566af6916fd0a20b784ee)
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/masm/masm-defs.pri | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri index f09a8329c9..0b887eac3d 100644 --- a/src/3rdparty/masm/masm-defs.pri +++ b/src/3rdparty/masm/masm-defs.pri @@ -38,3 +38,10 @@ INCLUDEPATH += $$_OUT_PWD win32-msvc2008|wince*: INCLUDEPATH += $$PWD/stubs/compat 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 + } +} |