diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-11 11:12:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-11 11:12:18 +0200 |
| commit | 3480c2e0565eeb938fb6fb8ba1dad640fb0a0d12 (patch) | |
| tree | 47c6963467a3c20326adfebd3cc0c15063ef04ba /src/3rdparty | |
| parent | 90e7521313fc9e89d492d65f9ad0dca3c38e7225 (diff) | |
| parent | d438be92dd7068fef94ce98e1ec039fe0ef4f3b3 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Ib3d81ad33a6ba28d891da91271a64d5fcc4874e6
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 + } +} |