diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-04-02 22:14:10 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-03 23:01:00 +0200 |
| commit | 605fbb17c1f37591f6893b48a78b058a1ccaf15e (patch) | |
| tree | b496c546893ca53d5ca7bc5c37ae5adbdcaf9d9c | |
| parent | e0a3df285293dad19abad8c787cb61e2b66d28a2 (diff) | |
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 <allan.jensen@digia.com>
| -rw-r--r-- | Tools/qmake/mkspecs/features/unix/default_post.prf | 4 |
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 } |