diff options
| author | Jesus Fernandez <jesus.fernandez@qt.io> | 2018-02-21 17:48:19 +0100 |
|---|---|---|
| committer | Jesus Fernandez <Jesus.Fernandez@qt.io> | 2018-02-22 12:12:23 +0000 |
| commit | 0975a9c892f1cb30b9e11e6becc469a3101cc2db (patch) | |
| tree | 393cb57034f73acda0cbb0404d0996ecf4069bcf | |
| parent | 92a7610e16be9b13d54378f9dad68fa498fa6c37 (diff) | |
Remove duplicated project options
Change-Id: I8f545c702b40ada37ce77716b84809b5d93c1146
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| -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 } } |