summaryrefslogtreecommitdiffstats
path: root/Tools/qmake/mkspecs/features/unix/default_post.prf
diff options
context:
space:
mode:
Diffstat (limited to 'Tools/qmake/mkspecs/features/unix/default_post.prf')
-rw-r--r--Tools/qmake/mkspecs/features/unix/default_post.prf4
1 files 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
}