summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
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)