diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-11 13:36:42 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-11 13:37:52 +0200 |
commit | 4c6032ea69a607f1126e9746f9b16b4bd01b852f (patch) | |
tree | 2084987690561a4238f968465b8c21d85881d9c9 /src/3rdparty | |
parent | 37da30b83021869b2fd069ea49d72d89b16c2046 (diff) | |
parent | 3480c2e0565eeb938fb6fb8ba1dad640fb0a0d12 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I95914046889022e0ef9bdc17338dc5895c5223fe
Diffstat (limited to 'src/3rdparty')
-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 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 + } +} |