diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:25:28 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:25:29 +0100 |
| commit | 9675579a6d7955b0b278a54050f6f503e2b10b1a (patch) | |
| tree | d2b628e571d99b28fd0baece8887b7459270472f /src/3rdparty | |
| parent | e76fabc8f1349d0eddf725453fc188d2ae0bf77e (diff) | |
| parent | 7c59817810e74269a48b9f522a4b2013b426d3c2 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Id364046378fa3522bd9a282a07c23c50ce48c806
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/assimp/assimp.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri index 771c291bf..e3eabe4ca 100644 --- a/src/3rdparty/assimp/assimp.pri +++ b/src/3rdparty/assimp/assimp.pri @@ -30,8 +30,8 @@ intel_icc: { QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON } else:gcc|clang: { # Stop compiler complaining about ignored qualifiers on return types - QMAKE_CFLAGS_WARN_ON += -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated-declarations -Wno-unused-function -Wno-reorder - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON + QMAKE_CFLAGS_WARN_ON += -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated-declarations -Wno-unused-function + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -Wno-reorder } else:msvc { # Disabled Warnings: # 4100: 'identifier' : unreferenced formal parameter |