Update the Linux-ICC mkspec

Include linux.conf instead of unix.conf, so it can compile Qt Base
these days (otherwise, we get an error from wayland-scanner.prf).

Remove the outdated information from the header. The mkspec now
matches ICC 12, not 10 and there are more diagnostics we disable.

Change-Id: Ic75593759a4d53f859a9a9e919d77b5c52d01024
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index 49a3306..36c3d56 100644 (file)
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -1,14 +1,6 @@
 #
 # qmake configuration for linux-icc
 #
-# Written for Intel C++ Compiler versions 10.x for GNU/Linux
-#
-# Note: Some of the remarks from the Intel compiler are disabled (even
-# with 'warn_on' specified):
-#
-# warning #654: overloaded virtual function "T::f" is only partially overridden in class "U"
-# warning #1572: floating-point equality and inequality comparisons are unreliable
-#
 
 MAKEFILE_GENERATOR     = UNIX
 TARGET_PLATFORM                = unix
@@ -104,5 +96,5 @@ QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
 QMAKE_CFLAGS_HIDESYMS   += -fvisibility=hidden
 QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
 
-include(../common/unix.conf)
+include(../common/linux.conf)
 load(qt_config)