diff options
Diffstat (limited to 'src/3rdparty/masm/masm.pri')
| -rw-r--r-- | src/3rdparty/masm/masm.pri | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri index 6c301fea38..7dfb24f4b8 100644 --- a/src/3rdparty/masm/masm.pri +++ b/src/3rdparty/masm/masm.pri @@ -118,11 +118,9 @@ QMAKE_EXTRA_COMPILERS += retgen # Don't warn about OVERRIDE and FINAL, since they are feature-checked anyways clang { QMAKE_CXXFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions - QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions } else: gcc { greaterThan(QT_GCC_MAJOR_VERSION, 4)|greaterThan(QT_GCC_MINOR_VERSION, 5) { # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr). - QMAKE_CXXFLAGS_WARN_ON += -Wno-c++0x-compat QMAKE_CXXFLAGS += -Wno-c++0x-compat } } |