From 605fbb17c1f37591f6893b48a78b058a1ccaf15e Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 2 Apr 2014 22:14:10 -0700 Subject: icc does not have option -Wno-c++0x-compat It keeps printing while compiling QtWebKit: icpc: command line warning #10006: ignoring unknown option '-Wno-c++0x-compat' Change-Id: I63d1ec2c5bcdfda373f75a66e70daa95fb48d906 Reviewed-by: Allan Sandfeld Jensen --- Tools/qmake/mkspecs/features/unix/default_post.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf index 79b72087c..f11333347 100644 --- a/Tools/qmake/mkspecs/features/unix/default_post.prf +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf @@ -42,7 +42,7 @@ linux-*g++* { } } -*-g++* { +*-g++*:!intel_icc { greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) { !contains(QMAKE_CXXFLAGS, -std=(c|gnu)\\+\\+(0x|11)) { # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr). @@ -53,7 +53,7 @@ linux-*g++* { } # Don't warn about OVERRIDE and FINAL, since they are feature-checked anyways -*clang:!contains(QMAKE_CXXFLAGS, -std=c++11) { +*clang:!intel_icc:!contains(QMAKE_CXXFLAGS, -std=c++11) { QMAKE_CXXFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions } -- cgit v1.2.3