From 160a93bc2fe9e86ce79f0cdfb2526b6d4608cfdc Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 25 Dec 2011 22:46:11 -0200 Subject: 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 --- mkspecs/linux-icc/qmake.conf | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index 49a3306538..36c3d5611b 100644 --- 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) -- cgit v1.2.3