summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-08-16 18:21:03 -0700
committerSean Harmer <sean.harmer@kdab.com>2014-08-17 16:03:39 +0200
commit16c020cafda121628d08ddfc3e640afaf41b994c (patch)
treeeee878c14eb76d0841114478c5c3d9ac418b6bc5 /src/3rdparty
parent2ceace37b2dd356076954873bb3df6a8860092c2 (diff)
ICC doesn't have -Wno-ignored-qualifiers
It prints an annoying warning for every .cpp icpc: command line warning #10006: ignoring unknown option '-Wno-ignored-qualifiers' It has its own option for the same warning. Let's use it. Change-Id: Ia540dc8836873d8386f8db092a29af41530c7c21 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/assimp/assimp.pri3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri
index 0c18ddc74..ec04e00bf 100644
--- a/src/3rdparty/assimp/assimp.pri
+++ b/src/3rdparty/assimp/assimp.pri
@@ -20,7 +20,8 @@ contains(QT_CONFIG, system-zlib) {
DEFINES += ASSIMP_BUILD_NO_OWN_ZLIB ASSIMP_BUILD_NO_COMPRESSED_IFC ASSIMP_BUILD_NO_Q3BSP_IMPORTER
# Stop compiler complaining about ignored qualifiers on return types
-gcc: QMAKE_CXXFLAGS += -Wno-ignored-qualifiers
+intel_icc: QMAKE_CXXFLAGS += -wd858
+else: gcc: QMAKE_CXXFLAGS += -Wno-ignored-qualifiers
clang: CONFIG += warn_off