summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-08-18 18:42:06 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-08-18 18:43:56 (GMT)
commit2eba19cdaa859dc9b06eb12f2dea9da27b69ea74 (patch)
tree5ec591e0956d9e49f510d3cff2ba3b257ee9a44d
parent76d1c995e5bce542c5aa22e7bbf8a012fd5cb50e (diff)
downloadQt-2eba19cdaa859dc9b06eb12f2dea9da27b69ea74.zip
Qt-2eba19cdaa859dc9b06eb12f2dea9da27b69ea74.tar.gz
Qt-2eba19cdaa859dc9b06eb12f2dea9da27b69ea74.tar.bz2
use intel linker and librarian with icc
Reviewed-by: thiago Task-number: QTBUG-12937
-rw-r--r--mkspecs/win32-icc/qmake.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index 3ae18b6..2dd796d 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -50,7 +50,7 @@ QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src
QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
-QMAKE_LINK = link
+QMAKE_LINK = xilink
QMAKE_LFLAGS = /NOLOGO
QMAKE_LFLAGS_RELEASE =
QMAKE_LFLAGS_DEBUG = /DEBUG
@@ -72,7 +72,7 @@ QMAKE_UIC = $$[QT_INSTALL_BINS]\\uic.exe
QMAKE_IDC = $$[QT_INSTALL_BINS]\\idc.exe
QMAKE_IDL = midl
-QMAKE_LIB = lib /NOLOGO
+QMAKE_LIB = xilib /NOLOGO
QMAKE_RC = rc
QMAKE_ZIP = zip -r -9