2 files changed, 30 insertions, 21 deletions

diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index f7b43b9..088c7f5 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -1,99 +1,106 @@
 #
 # $Id$
 #
-# qmake configuration for Win32/Intel C++
+# qmake configuration for win32-icc
+#
+# Written for Intel C++ 5.0.1, 6.0.1, and 7.0 for Windows.
 #
 
         MAKEFILE_GENERATOR= MSVC
         TEMPLATE        = app
-        CONFIG          += qt warn_on release incremental
+        CONFIG          += qt warn_on release incremental link_prl
         DEFINES                 += UNICODE
 
 exists( $(QTDIR)\.qtwinconfig ) {
         include( $(QTDIR)\.qtwinconfig )
 }
 
         QMAKE_CC        = icl
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  = 
         QMAKE_YACC      = byacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = -nologo -Zm200 $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_WARN_ON= -W3
         QMAKE_CFLAGS_WARN_OFF= -W0
-        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -Od -Ob1s)
-        QMAKE_CFLAGS_DEBUG= -Zi
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), )
+        QMAKE_CFLAGS_DEBUG= -Zi -Od
         QMAKE_CFLAGS_MT         = -MD
         QMAKE_CFLAGS_MT_DBG= -MDd
         QMAKE_CFLAGS_MT_DLL= -MD
         QMAKE_CFLAGS_MT_DLLDBG= -MDd
         QMAKE_CFLAGS_YACC=
-
-contains(CONFIG,stl){
-                QMAKE_CFLAGS+= -GX $(CFLAGS_EXTRA)
-}
-contains(CONFIG,exceptions){
-        QMAKE_CFLAGS += -GX
-}
-contains(CONFIG,rtti){
-                QMAKE_CFLAGS+= -GR $(CFLAGS_EXTRA)
-}
+        QMAKE_CFLAGS_STL_ON= -GX
+        QMAKE_CFLAGS_STL_OFF=
+        QMAKE_CFLAGS_RTTI_ON= -GR
+        QMAKE_CFLAGS_RTTI_OFF=
+QMAKE_CFLAGS_EXCEPTIONS_ON = -GX
+QMAKE_CFLAGS_EXCEPTIONS_OFF =
 
         QMAKE_CXX       = $$QMAKE_CC
         QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
         QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
         QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
         QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT
         QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG
         QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL
 QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG
         QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
-        QMAKE_CXXFLAGS_STL= $$QMAKE_CFLAGS_STL
+        QMAKE_CXXFLAGS_STL_ON= $$QMAKE_CFLAGS_STL_ON
+        QMAKE_CXXFLAGS_STL_OFF= $$QMAKE_CFLAGS_STL_OFF
+        QMAKE_CXXFLAGS_RTTI_ON= $$QMAKE_CFLAGS_RTTI_ON
+        QMAKE_CXXFLAGS_RTTI_OFF= $$QMAKE_CFLAGS_RTTI_OFF
+QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON
+QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF
 
         QMAKE_INCDIR    =
         QMAKE_INCDIR_QT         = $(QTDIR)\include
         QMAKE_LIBDIR_QT         = $(QTDIR)\lib
 
         QMAKE_RUN_CC    = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
         QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
+        QMAKE_RUN_CC_IMP_BATCH= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ @<<
         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_LFLAGS    = /NOLOGO $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll
         QMAKE_LFLAGS_DEBUG= /DEBUG
         QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console
         QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows
 QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL
 QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL
         QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
         QMAKE_LIBS_CONSOLE=
         QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib
-        QMAKE_LIBS_QT   = $(QTDIR)\lib\qt.lib
-        QMAKE_LIBS_QT_THREAD= $(QTDIR)\lib\qt-mt.lib
-        QMAKE_LIBS_QT_ENTRY= $(QTDIR)\lib\qtmain.lib
+        QMAKE_LIBS_QT   = qt.lib
+        QMAKE_LIBS_QT_THREAD= qt-mt.lib
+        QMAKE_LIBS_QT_ENTRY= qtmain.lib
 
         QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib
         QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll
 
         QMAKE_MOC       = $(QTDIR)\bin\moc.exe
         QMAKE_UIC       = $(QTDIR)\bin\uic.exe
         QMAKE_IDC       = $(QTDIR)\bin\idc.exe
 
         QMAKE_IDL       = midl
         QMAKE_LIB       = lib /NOLOGO
         QMAKE_RC        = rc
 
         QMAKE_ZIP       = zip -r -9
 
         QMAKE_COPY      = copy
         QMAKE_MOVE      = move
         QMAKE_DEL_FILE  = del
-        QMAKE_DEL_DIR   = deltree
+        QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= if not exist
+        QMAKE_MKDIR     = mkdir
 
         DSP_EXTENSION   = .dsp
diff --git a/mkspecs/win32-icc/qplatformdefs.h b/mkspecs/win32-icc/qplatformdefs.h
index 1d72e8a..d828db8 100644
--- a/mkspecs/win32-icc/qplatformdefs.h
+++ b/mkspecs/win32-icc/qplatformdefs.h
@@ -5,81 +5,83 @@
 #ifndef _UNICODE
 #define _UNICODE
 #endif
 #endif
 
 // Get Qt defines/settings
 
 #include "qglobal.h"
 
 #define _POSIX_
 #include <limits.h>
 #undef _POSIX_
 
 #include <tchar.h>
 #include <io.h>
 #include <direct.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <windows.h>
 
 #define Q_FS_FAT
-#ifdef QT_LARGE_FILE_SUPPORT
+#ifdef QT_LARGEFILE_SUPPORT
         #define QT_STATBUF              struct _stati64         // non-ANSI defs
         #define QT_STATBUF4TSTAT        struct _stati64         // non-ANSI defs
         #define QT_STAT                 ::_stati64
         #define QT_FSTAT        ::_fstati64
 #else
         #define QT_STATBUF              struct _stat    // non-ANSI defs
         #define QT_STATBUF4TSTAT        struct _stat    // non-ANSI defs
         #define QT_STAT                 ::_stat
         #define QT_FSTAT        ::_fstat
 #endif
         #define QT_STAT_REG     _S_IFREG
         #define QT_STAT_DIR     _S_IFDIR
         #define QT_STAT_MASK    _S_IFMT
 #if defined(_S_IFLNK)
         #  define QT_STAT_LNK   _S_IFLNK
 #endif
         #define QT_FILENO       _fileno
         #define QT_OPEN                 ::_open
         #define QT_CLOSE        ::_close
-#ifdef QT_LARGE_FILE_SUPPORT
+#ifdef QT_LARGEFILE_SUPPORT
         #define QT_LSEEK        ::_lseeki64
         #define QT_TSTAT        ::_tstati64
 #else
         #define QT_LSEEK        ::_lseek
         #define QT_TSTAT        ::_tstat
 #endif
         #define QT_READ                 ::_read
         #define QT_WRITE        ::_write
         #define QT_ACCESS       ::_access
         #define QT_GETCWD       ::_getcwd
         #define QT_CHDIR        ::_chdir
         #define QT_MKDIR        ::_mkdir
         #define QT_RMDIR        ::_rmdir
         #define QT_OPEN_RDONLY  _O_RDONLY
         #define QT_OPEN_WRONLY  _O_WRONLY
         #define QT_OPEN_RDWR    _O_RDWR
         #define QT_OPEN_CREAT   _O_CREAT
         #define QT_OPEN_TRUNC   _O_TRUNC
         #define QT_OPEN_APPEND  _O_APPEND
 #if defined(O_TEXT)
         # define QT_OPEN_TEXT   _O_TEXT
         # define QT_OPEN_BINARY         _O_BINARY
 #endif
 
         #define QT_SIGNAL_ARGS  int
 
         #define QT_VSNPRINTF    ::_vsnprintf
         #define QT_SNPRINTF     ::_snprintf
 
         # define F_OK0
         # define X_OK1
         # define W_OK2
         # define R_OK4
 
+typedef int mode_t;
+
 
 #endif // QPLATFORMDEFS_H