2 files changed, 56 insertions, 32 deletions

diff --git a/mkspecs/win32-borland/qmake.conf b/mkspecs/win32-borland/qmake.conf
index c5d3ea5..7aed9e8 100644
--- a/mkspecs/win32-borland/qmake.conf
+++ b/mkspecs/win32-borland/qmake.conf
@@ -1,12 +1,14 @@
 #
 # $Id$
 #
-# qmake configuration for Win32/Borland C++
+# qmake configuration for win32-borland
+#
+# Written for Borland C++.
 #
 
         MAKEFILE_GENERATOR= BMAKE
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
         DEFINES                 += UNICODE
         QMAKE_NOFORCE   = 1
 
@@ -30,13 +32,12 @@ QMAKE_CFLAGS_MT_DLL	= -tWM
         QMAKE_CFLAGS_MT_DLLDBG= -tWM
         QMAKE_CFLAGS_YACC=
         QMAKE_CFLAGS_CONSOLE= -tWC
-
-!contains(CONFIG,exceptions){
-        QMAKE_CFLAGS += -x-
-}
-!contains(CONFIG,rtti){
-                QMAKE_CFLAGS+= -RT- $(CFLAGS_EXTRA)
-}
+        QMAKE_CFLAGS_STL_ON=
+        QMAKE_CFLAGS_STL_OFF=
+        QMAKE_CFLAGS_RTTI_ON=
+        QMAKE_CFLAGS_RTTI_OFF= -RT-
+QMAKE_CFLAGS_EXCEPTIONS_ON =
+QMAKE_CFLAGS_EXCEPTIONS_OFF = -x-
 
         QMAKE_CXX       = $$QMAKE_CC
         QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
@@ -50,6 +51,12 @@ QMAKE_CXXFLAGS_MT_DLL	= $$QMAKE_CFLAGS_MT_DLL
 QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG
         QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
         QMAKE_CXXFLAGS_CONSOLE= $$QMAKE_CFLAGS_CONSOLE
+        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
@@ -70,7 +77,7 @@ QMAKE_LFLAGS_WINDOWS	= -aa -Tpe c0w32.obj
 QMAKE_LFLAGS_CONSOLE_DLL= -Gi -ap -Tpd c0d32.obj
 QMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj
 
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = import32.lib $(LIBS_EXTRA)
         QMAKE_LIBS_RT   = cw32i.lib
         QMAKE_LIBS_RTMT         = cw32mti.lib
         QMAKE_LIBS_CONSOLE=
@@ -88,10 +95,13 @@ QMAKE_IDC		= $(QTDIR)\bin\idc.exe
 
         QMAKE_IDL       = midl
         QMAKE_LIB       = tlib /C /P256
-        QMAKE_RC        = brcc32
+        QMAKE_RC        = brcc32 -dQ_CC_BOR
 
         QMAKE_ZIP       = zip -r -9
 
         QMAKE_COPY      = copy
         QMAKE_MOVE      = move
-        QMAKE_DEL       = del
+        QMAKE_DEL_FILE  = del
+        QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= if not exist
+        QMAKE_MKDIR     = mkdir
diff --git a/mkspecs/win32-borland/qplatformdefs.h b/mkspecs/win32-borland/qplatformdefs.h
index 5babada..121f863 100644
--- a/mkspecs/win32-borland/qplatformdefs.h
+++ b/mkspecs/win32-borland/qplatformdefs.h
@@ -28,33 +28,36 @@
 #include <windows.h>
 
 #if __BORLANDC__ >= 0x550
-#ifdef QT_LARGE_FILE_SUPPORT
+// Borland Builder 6
+
+#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_STATBUF4TSTAT      struct stati64  // non-ANSI defs
+        #  define QT_STAT       ::_stati64
         #define QT_FSTAT        ::fstati64
+        #  define QT_LSEEK      ::_lseeki64
+        #  define QT_TSTAT      ::_tstati64
 #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
+        #  define QT_LSEEK      ::_lseek
+        #  define QT_TSTAT      ::_tstat
 #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
-        #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
@@ -68,41 +71,47 @@
         # 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
-        #else                                   // all other systems
-#ifdef QT_LARGE_FILE_SUPPORT
+
+#else
+// Borland Builder 5
+
+#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
+        #  define QT_LSEEK      ::lseeki64
+        #  define QT_TSTAT      ::tstati64
 #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
+        #  define QT_LSEEK      ::lseek
+        #  define QT_TSTAT      ::tstat
 #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
-        #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
+
 # if defined(Q_OS_OS2EMX)
 // This is documented in the un*x to OS/2-EMX Porting FAQ:
         // http://homepages.tu-darmstadt.de/~st002279/os2/porting.html
@@ -112,6 +121,7 @@
         #  define QT_GETCWD     ::getcwd
         #  define QT_CHDIR      ::chdir
 # endif
+
         # define QT_MKDIR       ::mkdir
         # define QT_RMDIR       ::rmdir
         # define QT_OPEN_RDONLY         O_RDONLY
@@ -120,11 +130,15 @@
         # 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_BINARYO_BINARY
 # endif
-#endif
+
+#endif // __BORLANDC__ >= 0x550
+
+// Borland Builder 5 and 6
 
         #define QT_SIGNAL_ARGS  int