summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2011-12-25 22:46:11 -0200
committerQt by Nokia <qt-info@nokia.com>2012-03-22 18:59:45 +0100
commit160a93bc2fe9e86ce79f0cdfb2526b6d4608cfdc (patch)
tree55288496a4801cc40f237b9932692a5118da5f74 /mkspecs
parentbd112dab564997fc4260ecc9de1c29aaad7ffa53 (diff)
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>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/linux-icc/qmake.conf10
1 files changed, 1 insertions, 9 deletions
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)