diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-22 21:48:21 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-22 21:48:21 +0100 |
| commit | 853ab6276facd51d61ad2451ee14170595ad45db (patch) | |
| tree | 28757ad600c938438cb43010455c5f70eeebdffe /src/3rdparty/masm | |
| parent | d21fd0662782a5fc4c01a5544f0064c9f0f121dc (diff) | |
| parent | 0761786fc96ff68550697e5386274c7418c73031 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I02f3acf357381c48f6400e910a03df744d73d826
Diffstat (limited to 'src/3rdparty/masm')
| -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 aeb9babb05..f7cdae7421 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 } } |