summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-04-11 20:25:07 -0700
committerThiago Macieira <thiago.macieira@intel.com>2016-04-12 18:18:56 +0000
commit9cf741e9cbba0de12af0e6ccc460f3b7a96d3d7a (patch)
tree28bc894b68e4947f34868a742617922f2884d6ec
parentefe6539cc9674cf3cca5d1487da6b70763064879 (diff)
Fix icc warnings: "else" was missing
Change-Id: Id75834dab9ed466e94c7ffff14447ec2379c5b17 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/3rdparty/assimp/assimp.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri
index fa5206eac..96a3f93de 100644
--- a/src/3rdparty/assimp/assimp.pri
+++ b/src/3rdparty/assimp/assimp.pri
@@ -23,7 +23,7 @@ DEFINES += ASSIMP_BUILD_NO_OWN_ZLIB ASSIMP_BUILD_NO_COMPRESSED_IFC ASSIMP_BUILD_
intel_icc: {
QMAKE_CFLAGS_WARN_ON += -wd858
QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
-} gcc|clang: {
+} else:gcc|clang: {
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
}