-CHECK if DIR exist added to qmake.conf's

-use arm-linux-g++ for linking now

hopefully not removed anything important

Added python tool to opiefy mkspecs

107 files changed, 2558 insertions, 438 deletions

diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf
new file mode 100755
index 0000000..abc111e
--- a/dev/null
+++ b/mkspecs/aix-g++-64/qmake.conf
@@ -0,0 +1,81 @@
+#
+# $Id$
+#
+# qmake configuration for aix-g++-64
+#
+
+        MAKEFILE_GENERATOR= UNIX
+        TEMPLATE        = app
+        CONFIG          += qt warn_on release link_prl
+
+        QMAKE_CC        = gcc
+        QMAKE_LEX       = flex
+        QMAKE_LEXFLAGS  = 
+        QMAKE_YACC      = yacc
+        QMAKE_YACCFLAGS         = -d
+        QMAKE_CFLAGS    = -maix64 $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS_DEPS= -M
+        QMAKE_CFLAGS_WARN_ON= -Wall -W
+        QMAKE_CFLAGS_WARN_OFF= -w
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
+        QMAKE_CFLAGS_DEBUG= -g
+        QMAKE_CFLAGS_SHLIB=
+        QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
+        QMAKE_CFLAGS_THREAD= -D_THREAD_SAFE
+
+        QMAKE_CXX       = g++
+        QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
+        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_SHLIB= $$QMAKE_CFLAGS_SHLIB
+        QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
+        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
+
+        QMAKE_INCDIR    =
+        QMAKE_LIBDIR    =
+        QMAKE_INCDIR_X11= /usr/X11R6/include
+        QMAKE_LIBDIR_X11= /usr/X11R6/lib
+        QMAKE_INCDIR_QT         = $(QTDIR)/include
+        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
+        QMAKE_INCDIR_OPENGL= /usr/X11R6/include
+        QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
+
+        QMAKE_LINK      = g++
+        QMAKE_LINK_SHLIB= g++
+        QMAKE_LFLAGS    = -b64 $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS_RELEASE=
+        QMAKE_LFLAGS_DEBUG=
+        QMAKE_LFLAGS_SHLIB= -shared
+        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
+        QMAKE_LFLAGS_SONAME=
+        QMAKE_LFLAGS_THREAD= -L/usr/lib/threads
+        QMAKE_AIX_SHLIB         = 1
+
+        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS_DYNLOAD= -ldl
+        QMAKE_LIBS_X11  = -lXext -lX11 -lm -lbind
+        QMAKE_LIBS_X11SM= -lSM -lICE
+        QMAKE_LIBS_QT   = -lqt
+        QMAKE_LIBS_QT_THREAD= -lqt-mt
+        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
+        QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
+        QMAKE_LIBS_THREAD= -lpthreads
+
+        QMAKE_MOC       = $(QTDIR)/bin/moc
+        QMAKE_UIC       = $(QTDIR)/bin/uic
+
+        QMAKE_AR        = ar cqs
+        QMAKE_RANLIB    =
+
+        QMAKE_TAR       = tar -cf
+        QMAKE_GZIP      = gzip -9f
+
+        QMAKE_COPY      = cp -f
+        QMAKE_MOVE      = mv -f
+        QMAKE_DEL_FILE  = rm -f
+        QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf
index c79fe81..92d098b 100644
--- a/mkspecs/aix-g++/qmake.conf
+++ b/mkspecs/aix-g++/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
@@ -52,6 +52,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
         QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME=
         QMAKE_LFLAGS_THREAD= -L/usr/lib/threads
+        QMAKE_AIX_SHLIB         = 1
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldl
@@ -76,3 +77,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf
index 2e08cbf..42e362b 100644
--- a/mkspecs/aix-xlc-64/qmake.conf
+++ b/mkspecs/aix-xlc-64/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = xlc
         QMAKE_CC_THREAD         = xlc_r
@@ -15,13 +15,15 @@ QMAKE_LEXFLAGS		=
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = -qstrict -q64 $(CFLAGS_EXTRA)
-        QMAKE_CFLAGS_WARN_ON= -qwarn64
+# -qwarn64 turns on too many bogus warnings and shadows real warnings
+        #QMAKE_CFLAGS_WARN_ON= -qwarn64
+QMAKE_CFLAGS_WARN_ON    =
         QMAKE_CFLAGS_WARN_OFF=
         QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3)
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB=
         QMAKE_CFLAGS_YACC=
-        QMAKE_CFLAGS_THREAD= -qthreaded -D_THREAD_SAFE
+        QMAKE_CFLAGS_THREAD= -qthreaded
 
         QMAKE_CXX       = xlC
         QMAKE_CXX_THREAD= xlC_r
@@ -59,6 +61,7 @@ QMAKE_LFLAGS_SHLIB	=
         QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME=
         QMAKE_LFLAGS_THREAD= -L/usr/lib/threads
+        QMAKE_AIX_SHLIB         = 1
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldl
@@ -83,3 +86,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf
index 76ead61..3ce593c 100644
--- a/mkspecs/aix-xlc/qmake.conf
+++ b/mkspecs/aix-xlc/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = xlc
         QMAKE_CC_THREAD         = xlc_r
@@ -21,7 +21,7 @@ QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3)
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB=
         QMAKE_CFLAGS_YACC=
-        QMAKE_CFLAGS_THREAD= -qthreaded -D_THREAD_SAFE
+        QMAKE_CFLAGS_THREAD= -qthreaded
 
         QMAKE_CXX       = xlC
         QMAKE_CXX_THREAD= xlC_r
@@ -49,8 +49,8 @@ QMAKE_LINK_SHLIB	= ld
         QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 \
                             -o $(TARGETD) \
                             $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \
-                          ar q lib$(QMAKE_TARGET).a $(TARGETD); \
-                          ranlib lib$(QMAKE_TARGET).a; \
+                          $(AR) lib$(QMAKE_TARGET).a $(TARGETD); \
+                          $(RANLIB) lib$(QMAKE_TARGET).a; \
                           mv lib$(QMAKE_TARGET).a $(DESTDIR)
         QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
@@ -59,6 +59,7 @@ QMAKE_LFLAGS_SHLIB	=
         QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME=
         QMAKE_LFLAGS_THREAD= -L/usr/lib/threads
+        QMAKE_AIX_SHLIB         = 1
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldl
@@ -83,3 +84,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/aix-xlc/qplatformdefs.h b/mkspecs/aix-xlc/qplatformdefs.h
index 7685a7b..79afa5d 100644
--- a/mkspecs/aix-xlc/qplatformdefs.h
+++ b/mkspecs/aix-xlc/qplatformdefs.h
@@ -95,7 +95,7 @@
         #define QT_SOCKOPTLEN_T         int
 #endif
 
-#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500)
 // AIX 4.3 and better only
         #define QT_SNPRINTF     ::snprintf
         #define QT_VSNPRINTF    ::vsnprintf
diff --git a/mkspecs/bsdi-g++/qmake.conf b/mkspecs/bsdi-g++/qmake.conf
index be4e125..45cd8fb 100644
--- a/mkspecs/bsdi-g++/qmake.conf
+++ b/mkspecs/bsdi-g++/qmake.conf
@@ -8,7 +8,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
@@ -80,3 +80,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf
index 4532c89..7258fa8 100644
--- a/mkspecs/cygwin-g++/qmake.conf
+++ b/mkspecs/cygwin-g++/qmake.conf
@@ -3,16 +3,18 @@
 #
 # qmake configuration for cygwin-g++
 #
+# Written for Qt/X11 on Cygwin, using the POSIX API.
+#
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release incremental
+        CONFIG          += qt warn_on release incremental link_prl
 QMAKE_INCREMENTAL_STYLE  = sublib
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  = 
-        QMAKE_YACC      = yacc
+        QMAKE_YACC      = byacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_DEPS= -M
@@ -54,7 +56,9 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME= -Wl,-soname,
         QMAKE_LFLAGS_THREAD=
         QMAKE_RPATH     = -Wl,-rpath,
-
+        QMAKE_CYGWIN_SHLIB= 1
+        QMAKE_CYGWIN_EXE= 1
+ 
         QMAKE_LIBS      = $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldl
         QMAKE_LIBS_X11  = -lXext -lX11
@@ -78,3 +82,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/cygwin-g++/qplatformdefs.h b/mkspecs/cygwin-g++/qplatformdefs.h
index b985044..bc04a69 100644
--- a/mkspecs/cygwin-g++/qplatformdefs.h
+++ b/mkspecs/cygwin-g++/qplatformdefs.h
@@ -42,12 +42,14 @@
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#include <sys/ipc.h>
+// Cygwin does not provide <sys/ipc.h> and <sys/shm.h> because it
+// doesn't support SysV IPC or shared memory. See for example:
+        // http://afni.nimh.nih.gov/afni/afniboard/messages/1725.html
 #include <sys/time.h>
-#include <sys/shm.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <windows.h>
 
 // Resolver functions are not implemented in Cygwin, headers
 // <arpa/nameser.h> and <resolv.h> are missing:
diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf
index 2051427..c53e6e9 100644
--- a/mkspecs/darwin-g++/qmake.conf
+++ b/mkspecs/darwin-g++/qmake.conf
@@ -1,12 +1,16 @@
 #
 # $Id$
 #
-# qmake configuration for darwin-g++ (Darwin/X11)
+# qmake configuration for darwin-g++
+#
+# Written for Qt/X11 on Darwin and XFree86.
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release resource_fork
+        CONFIG          += qt warn_on release native_precompiled_headers
+        CONFIG          += qt warn_on release link_prl
+DEFINES                 += __DARWIN_X11__
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
@@ -17,10 +21,11 @@ QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_DEPS= -M
         QMAKE_CFLAGS_WARN_ON= -Wall -W
         QMAKE_CFLAGS_WARN_OFF= -w
-        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3)
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB= -fPIC
         QMAKE_EXTENSION_SHLIB= dylib
+        QMAKE_EXTENSION_PLUGIN= so
         QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
         QMAKE_CFLAGS_THREAD=
 
@@ -49,9 +54,14 @@ QMAKE_LINK_SHLIB	= c++
         QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
-        QMAKE_LFLAGS_SHLIB= -dynamiclib
+QMAKE_LFLAGS_APP        = -prebind
+        QMAKE_LFLAGS_SHLIB= -prebind -dynamiclib -single_module -headerpad_max_install_names
         QMAKE_LFLAGS_PLUGIN= -bundle
         QMAKE_LFLAGS_THREAD= 
+
+QMAKE_LFLAGS_VERSION    = -current_version$${LITERAL_WHITESPACE}
+QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE}
+
         QMAKE_RPATH     = 
 
         QMAKE_LIBS_DYNLOAD=
@@ -78,3 +88,5 @@ QMAKE_COPY_DIR		= $$QMAKE_COPY -r
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/darwin-g++/qplatformdefs.h b/mkspecs/darwin-g++/qplatformdefs.h
index 9f09f4c..0a1b602 100644
--- a/mkspecs/darwin-g++/qplatformdefs.h
+++ b/mkspecs/darwin-g++/qplatformdefs.h
@@ -79,5 +79,7 @@
         #define QT_SNPRINTF     ::snprintf
         #define QT_VSNPRINTF    ::vsnprintf
 
+#define QT_AOUT_UNDERSCORE
+
 
 #endif // QPLATFORMDEFS_H
diff --git a/mkspecs/dgux-g++/qmake.conf b/mkspecs/dgux-g++/qmake.conf
index c8c7527..011a1c7 100644
--- a/mkspecs/dgux-g++/qmake.conf
+++ b/mkspecs/dgux-g++/qmake.conf
@@ -8,7 +8,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
@@ -73,3 +73,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf
index 3269c83..ac7f728 100644
--- a/mkspecs/freebsd-g++/qmake.conf
+++ b/mkspecs/freebsd-g++/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
@@ -78,3 +78,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf
index 7ce4711..d43273e 100644
--- a/mkspecs/hpux-acc-64/qmake.conf
+++ b/mkspecs/hpux-acc-64/qmake.conf
@@ -49,7 +49,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
@@ -58,7 +58,7 @@ QMAKE_YACC		= yacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = -Ae +DA2.0W -w $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_WARN_ON=
-        QMAKE_CFLAGS_WARN_OFF=
+        QMAKE_CFLAGS_WARN_OFF= -w
         QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O +Osize)
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB= +Z
@@ -66,7 +66,8 @@ QMAKE_CFLAGS_YACC	=
         QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
 
         QMAKE_CXX       = aCC
-        QMAKE_CXXFLAGS  = -Aa +DA2.0W -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS  = -Aa +DA2.0W -w -D__STRICT_ANSI__ -D_HPUX_SOURCE $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS_DEPS= +M
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
         QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
@@ -88,21 +89,23 @@ QMAKE_LINK		= aCC
         QMAKE_LINK_SHLIB= aCC
         QMAKE_LFLAGS    = +DA2.0W -Wl,+s $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE= -O
-        QMAKE_LFLAGS_DEBUG= -Wl,+tools -g
-        QMAKE_LFLAGS_SHLIB= -b
+        QMAKE_LFLAGS_DEBUG= -g
+        QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared
         QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME= -Wl,+h,
         QMAKE_LFLAGS_THREAD=
         QMAKE_RPATH     = -Wl,+b,
+        QMAKE_HPUX_SHLIB= 3
+        QMAKE_EXTENSION_SHLIB= sl
 
-        QMAKE_LIBS      = $(LIBS_EXTRA)
-        QMAKE_LIBS_DYNLOAD= -ldld
+        QMAKE_LIBS      = -lm $(LIBS_EXTRA)
+        QMAKE_LIBS_DYNLOAD= -ldl
         QMAKE_LIBS_X11  = -lXext -lX11
         QMAKE_LIBS_X11SM= -lSM -lICE
         QMAKE_LIBS_QT   = -lqt
         QMAKE_LIBS_QT_THREAD= -lqt-mt
-        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
-        QMAKE_LIBS_OPENGL_QT= -lGL -lXm
+        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt
+        QMAKE_LIBS_OPENGL_QT= -lGL -lXmu -lXt
         QMAKE_LIBS_THREAD= -lpthread
         QMAKE_LIBS_YACC         = -ly
 
@@ -119,3 +122,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/hpux-acc-64/qplatformdefs.h b/mkspecs/hpux-acc-64/qplatformdefs.h
index 8a1410c..1779974 100644
--- a/mkspecs/hpux-acc-64/qplatformdefs.h
+++ b/mkspecs/hpux-acc-64/qplatformdefs.h
@@ -22,9 +22,7 @@
 #include <grp.h>
 #include <pwd.h>
 #include <signal.h>
-#include <dl.h>
-#define QT_HPUX_LD
-#define QT_NO_LIBRARY_UNLOAD
+#include <dlfcn.h>
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -37,7 +35,15 @@
 
 // DNS header files are not fully covered by X/Open specifications.
 // In particular nothing is said about res_* :/
+// #ifdef __cplusplus
+// extern "C" {
+// #endif
+// getres() is mangled because of missing extern "C" on
+// HP-UX 11.x systems missing PHCO_23963
 #include <resolv.h>
+// #ifdef __cplusplus
+// }
+// #endif
 // Undeclared - at least on HP-UX 10.20.
 extern "C" int res_init();
 
diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf
index f9f88bb..8aa3b43 100644
--- a/mkspecs/hpux-acc-o64/qmake.conf
+++ b/mkspecs/hpux-acc-o64/qmake.conf
@@ -49,7 +49,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
@@ -66,7 +66,7 @@ QMAKE_CFLAGS_YACC	=
         QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
 
         QMAKE_CXX       = aCC
-        QMAKE_CXXFLAGS  = +DA2.0 -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS  = +DA2.0 -w -D__STRICT_ANSI__ -D_HPUX_SOURCE $(CXXFLAGS_EXTRA)
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
         QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
@@ -93,8 +93,10 @@ QMAKE_LFLAGS_SHLIB	= -b
         QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME= -Wl,+h,
         QMAKE_RPATH     = -Wl,+b,
+        QMAKE_HPUX_SHLIB= 2
+        QMAKE_EXTENSION_SHLIB= sl
 
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = -lm $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldld
         QMAKE_LIBS_X11  = -lXext -lX11
         QMAKE_LIBS_X11SM= -lSM -lICE
@@ -119,3 +121,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/hpux-acc-o64/qplatformdefs.h b/mkspecs/hpux-acc-o64/qplatformdefs.h
index 8a1410c..6307fc0 100644
--- a/mkspecs/hpux-acc-o64/qplatformdefs.h
+++ b/mkspecs/hpux-acc-o64/qplatformdefs.h
@@ -37,7 +37,15 @@
 
 // DNS header files are not fully covered by X/Open specifications.
 // In particular nothing is said about res_* :/
+// #ifdef __cplusplus
+// extern "C" {
+// #endif
+// getres() is mangled because of missing extern "C" on
+// HP-UX 11.x systems missing PHCO_23963
 #include <resolv.h>
+// #ifdef __cplusplus
+// }
+// #endif
 // Undeclared - at least on HP-UX 10.20.
 extern "C" int res_init();
 
diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf
index c344f26..2cbb1e6 100644
--- a/mkspecs/hpux-acc/qmake.conf
+++ b/mkspecs/hpux-acc/qmake.conf
@@ -28,24 +28,25 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          = qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  = 
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    = -Ae +DAportable -w +Z $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS    = -Ae +DAportable -w $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_WARN_ON=
-        QMAKE_CFLAGS_WARN_OFF=
+        QMAKE_CFLAGS_WARN_OFF= -w
         QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
         QMAKE_CFLAGS_DEBUG= -g
-        QMAKE_CFLAGS_SHLIB= 
+        QMAKE_CFLAGS_SHLIB= +Z
         QMAKE_CFLAGS_YACC=
         QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
 
         QMAKE_CXX       = aCC
-        QMAKE_CXXFLAGS  = +DAportable -w +Z -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS  = +DAportable -w -D__STRICT_ANSI__ -D_HPUX_SOURCE $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS_DEPS= +M
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
         QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
@@ -67,21 +68,23 @@ QMAKE_LINK		= aCC
         QMAKE_LINK_SHLIB= aCC
         QMAKE_LFLAGS    = +DAportable -Wl,+s $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE= -O
-        QMAKE_LFLAGS_DEBUG=
+        QMAKE_LFLAGS_DEBUG= -g
         QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared
         QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME= -Wl,+h,
         QMAKE_LFLAGS_THREAD=
         QMAKE_RPATH     = -Wl,+b,
+        QMAKE_HPUX_SHLIB= 1
+        QMAKE_EXTENSION_SHLIB= sl
 
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = -lm $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldld
         QMAKE_LIBS_X11  = -lXext -lX11
         QMAKE_LIBS_X11SM= -lSM -lICE
         QMAKE_LIBS_QT   = -lqt
         QMAKE_LIBS_QT_THREAD= -lqt-mt
-        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
-        QMAKE_LIBS_OPENGL_QT= -lGL -lXm
+        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt
+        QMAKE_LIBS_OPENGL_QT= -lGL -lXmu -lXt
         QMAKE_LIBS_THREAD= -lpthread
         QMAKE_LIBS_YACC         = -ly
 
@@ -98,3 +101,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/hpux-acc/qplatformdefs.h b/mkspecs/hpux-acc/qplatformdefs.h
index fb74ca7..d6dc587 100644
--- a/mkspecs/hpux-acc/qplatformdefs.h
+++ b/mkspecs/hpux-acc/qplatformdefs.h
@@ -37,7 +37,15 @@
 
 // DNS header files are not fully covered by X/Open specifications.
 // In particular nothing is said about res_* :/
+// #ifdef __cplusplus
+// extern "C" {
+// #endif
+// getres() is mangled because of missing extern "C" on
+// HP-UX 11.x systems missing PHCO_23963
 #include <resolv.h>
+// #ifdef __cplusplus
+// }
+// #endif
 // Undeclared - at least on HP-UX 10.20.
 extern "C" int res_init();
 
@@ -83,4 +91,5 @@ extern "C" int res_init();
 #define select(a,b,c,d,e) select((a), (int *)(b), (int *)(c), (int *)(d), (e))
 #endif
 
+
 #endif // QPLATFORMDEFS_H
diff --git a/mkspecs/hpux-cc/qmake.conf b/mkspecs/hpux-cc/qmake.conf
index fe5d293..950bc99 100644
--- a/mkspecs/hpux-cc/qmake.conf
+++ b/mkspecs/hpux-cc/qmake.conf
@@ -29,7 +29,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
@@ -45,7 +45,7 @@ QMAKE_CFLAGS_SHLIB	= +Z
         QMAKE_CFLAGS_YACC=
 
         QMAKE_CXX       = CC
-        QMAKE_CXXFLAGS  = +DA1.1e -w +a1 $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS  = +DA1.1e -w +a1 -D_HPUX_SOURCE $(CXXFLAGS_EXTRA)
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
         QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
@@ -72,8 +72,9 @@ QMAKE_LFLAGS_SHLIB	= -b
         QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME= -Wl,+h,
         QMAKE_RPATH     = -Wl,+b,
+        QMAKE_HPUX_SHLIB= 1
 
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = -lm $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldld
         QMAKE_LIBS_X11  = -lXext -lX11
         QMAKE_LIBS_X11SM= -lSM -lICE
@@ -95,3 +96,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf
index 0af1de7..22e4cff 100644
--- a/mkspecs/hpux-g++/qmake.conf
+++ b/mkspecs/hpux-g++/qmake.conf
@@ -3,14 +3,13 @@
 #
 # qmake configuration for hpux-g++
 #
-# We define _POSIX_C_SOURCE to 199506L when using threads, therefore
-# we also need to redefine _HPUX_SOURCE.
-# See pthread(3t) for more details.
+# We define _POSIX_C_SOURCE to 199506L when using threads,
+# therefore we also need to redefine _HPUX_SOURCE.
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl plugin_no_soname
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
@@ -28,7 +27,7 @@ QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
         QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
 
         QMAKE_CXX       = g++
-        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -D_HPUX_SOURCE $(CXXFLAGS_EXTRA)
         QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
@@ -40,7 +39,7 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
         QMAKE_INCDIR    =
         QMAKE_LIBDIR    =
-        QMAKE_INCDIR_X11= /usr/include/X11R6
+        QMAKE_INCDIR_X11= 
         QMAKE_LIBDIR_X11= /usr/lib/X11R6
         QMAKE_INCDIR_QT         = $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
@@ -55,18 +54,21 @@ QMAKE_LFLAGS_DEBUG	=
         QMAKE_LFLAGS_SHLIB= -fPIC -shared
         QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME= -Wl,+h,
+        QMAKE_LFLAGS_THREAD=
         QMAKE_RPATH     = -Wl,+b,
+        QMAKE_HPUX_SHLIB= 1
+        QMAKE_EXTENSION_SHLIB= sl
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldld
         QMAKE_LIBS_X11  = -lXext -lX11 -lm
         QMAKE_LIBS_X11SM= -lSM -lICE
         QMAKE_LIBS_QT   = -lqt
-
-        QMAKE_LIBS_OPENGL=
-        QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
+        QMAKE_LIBS_QT_THREAD= -lqt-mt
         QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
         QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
+        QMAKE_LIBS_THREAD= -lpthread
+        QMAKE_LIBS_YACC         = -ly
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
@@ -81,3 +83,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/hpux-g++/qplatformdefs.h b/mkspecs/hpux-g++/qplatformdefs.h
index 447e883..a9080c7 100644
--- a/mkspecs/hpux-g++/qplatformdefs.h
+++ b/mkspecs/hpux-g++/qplatformdefs.h
@@ -37,9 +37,15 @@
 
 // DNS header files are not fully covered by X/Open specifications.
 // In particular nothing is said about res_* :/
-#include <netinet/in.h>
-#include <arpa/nameser.h>
+// #ifdef __cplusplus
+// extern "C" {
+// #endif
+// getres() is mangled because of missing extern "C" on
+// HP-UX 11.x systems missing PHCO_23963
 #include <resolv.h>
+// #ifdef __cplusplus
+// }
+// #endif
 // Undeclared - at least on HP-UX 10.20.
 extern "C" int res_init();
 
@@ -84,4 +90,5 @@ extern "C" int res_init();
 #define select(a,b,c,d,e) select((a), (int *)(b), (int *)(c), (int *)(d), (e))
 #endif
 
+
 #endif // QPLATFORMDEFS_H
diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf
new file mode 100644
index 0000000..7687cd9
--- a/dev/null
+++ b/mkspecs/hpuxi-acc-32/qmake.conf
@@ -0,0 +1,124 @@
+#
+# $Id$
+#
+# qmake configuration for hpuxi-acc-32
+#
+# We define _POSIX_C_SOURCE to 199506L when using threads, therefore
+# we also need to redefine _HPUX_SOURCE.
+# From pthread(3t):
+        # Some documentation will recommend the use of -D_REENTRANT for
+        # compilation.  While this also functions properly, it is considered
+        # an obsolescent form.
+# See pthread(3t) for more details.
+#
+# From the "HP aC++ Online Programmer's Guide":
+        # When +DA2.0W is specified:
+        # * 64-bit SVR4 Executable and Linking Format (ELF) object files
+        #   are generated for PA-RISC 2.0. 
+        # * The preprocessor predefined macro, __LP64__ is defined. 
+        # * The correct path for 64-bit system and language libraries is
+        #   selected.
+        # When +DD32 is specified:
+        # * The size of an int, long, or pointer data type is 32-bits. 
+        #   The size of an int data type is 32-bits. The size of a long or
+        #   pointer data type is 64-bits.
+        # * This is the default, currently equivalent to +DA1.1 architecture.
+        # When +DD64 is specified:
+        # * The size of an int data type is 32-bits. The size of a long or
+        #   pointer data type is 64-bits.
+        # * This is currently equivalent to +DA2.OW architecture.
+        # * The preprocessor predefined macro, __LP64__ is defined.
+        # Using +DS to Specify Instruction Scheduling:
+        # * By default, the compiler performs scheduling tuned for the system
+        #   on which you are compiling, or, if specified, tuned for the setting
+        #   of the +DA option.
+#
+# From the online "C/HP-UX Reference Manual":
+        #-Aa
+        #   Enables strict ANSI C compliance.
+        # -Ae
+        #   Enables ANSI C compliance, HP value-added features (as described
+        #   for +e option), and _HPUX_SOURCE name space macro. It is equivalent
+        #   to -Aa +e -D_HPUX_SOURCE.
+        # +e
+        #   Enables the following HP value added features while compiling in
+        #   ANSI C mode: sized enum, long long, long pointers, compiler supplied
+        #   defaults for missing arguments to intrinsic calls, and $ in identifier
+        #   HP C extensions.
+#
+
+        MAKEFILE_GENERATOR= UNIX
+        TEMPLATE        = app
+        CONFIG          += qt warn_on release plugin_no_soname
+
+        QMAKE_CC        = cc
+        QMAKE_LEX       = lex
+        QMAKE_LEXFLAGS  = 
+        QMAKE_YACC      = yacc
+        QMAKE_YACCFLAGS         = -d
+        QMAKE_CFLAGS    = +DD32 +DSitanium -w $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS_WARN_ON=
+        QMAKE_CFLAGS_WARN_OFF= -w
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), +O2 +Osize)
+        QMAKE_CFLAGS_DEBUG= -g
+        QMAKE_CFLAGS_SHLIB= +Z
+        QMAKE_CFLAGS_YACC=
+        QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
+
+        QMAKE_CXX       = aCC
+        QMAKE_CXXFLAGS  = +DD32 +DSitanium -w -D__STRICT_ANSI__ -D_HPUX_SOURCE $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS_DEPS= +M
+        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_SHLIB= $$QMAKE_CFLAGS_SHLIB
+        QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
+        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
+
+        QMAKE_INCDIR    =
+        QMAKE_LIBDIR    =
+        QMAKE_INCDIR_X11= /usr/include/X11R6
+        QMAKE_LIBDIR_X11= /usr/lib/hpux32/X11R6
+        QMAKE_INCDIR_QT         = $(QTDIR)/include
+        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
+        QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
+        QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib/hpux32 /usr/contrib/X11R6/lib/hpux32
+
+        QMAKE_LINK      = aCC
+        QMAKE_LINK_SHLIB= aCC
+        QMAKE_LFLAGS    = +DD32 +DSitanium -Wl,+s $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS_RELEASE= +O2
+        QMAKE_LFLAGS_DEBUG= -g
+        QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared
+        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
+        QMAKE_LFLAGS_SONAME= -Wl,+h,
+        QMAKE_LFLAGS_THREAD=
+        QMAKE_RPATH     = 
+
+        QMAKE_LIBS      = -lm $(LIBS_EXTRA)
+        QMAKE_LIBS_DYNLOAD= -ldl
+        QMAKE_LIBS_X11  = -lXext -lX11
+        QMAKE_LIBS_X11SM= -lSM -lICE
+        QMAKE_LIBS_QT   = -lqt
+        QMAKE_LIBS_QT_THREAD= -lqt-mt
+        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt
+        QMAKE_LIBS_OPENGL_QT= -lGL -lXmu -lXt
+        QMAKE_LIBS_THREAD= -lpthread
+        QMAKE_LIBS_YACC         = -ly
+
+        QMAKE_MOC       = $(QTDIR)/bin/moc
+        QMAKE_UIC       = $(QTDIR)/bin/uic
+
+        QMAKE_AR        = ar cqs
+        QMAKE_RANLIB    =
+
+        QMAKE_TAR       = tar -cf
+        QMAKE_GZIP      = gzip -9f
+
+        QMAKE_COPY      = cp -f
+        QMAKE_MOVE      = mv -f
+        QMAKE_DEL_FILE  = rm -f
+        QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/hpuxi-acc-32/qplatformdefs.h b/mkspecs/hpuxi-acc-32/qplatformdefs.h
new file mode 100644
index 0000000..6307fc0
--- a/dev/null
+++ b/mkspecs/hpuxi-acc-32/qplatformdefs.h
@@ -0,0 +1,88 @@
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+#include <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+
+#ifdef QT_THREAD_SUPPORT
+#include <pthread.h>
+#endif
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#include <dl.h>
+#define QT_HPUX_LD
+#define QT_NO_LIBRARY_UNLOAD
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+// DNS header files are not fully covered by X/Open specifications.
+// In particular nothing is said about res_* :/
+// #ifdef __cplusplus
+// extern "C" {
+// #endif
+// getres() is mangled because of missing extern "C" on
+// HP-UX 11.x systems missing PHCO_23963
+#include <resolv.h>
+// #ifdef __cplusplus
+// }
+// #endif
+// Undeclared - at least on HP-UX 10.20.
+extern "C" int res_init();
+
+
+#if !defined(QT_NO_COMPAT)
+        #define QT_STATBUF      struct stat
+        #define QT_STATBUF4TSTATstruct stat
+        #define QT_STAT                 ::stat
+        #define QT_FSTAT        ::fstat
+        #define QT_STAT_REG     S_IFREG
+        #define QT_STAT_DIR     S_IFDIR
+        #define QT_STAT_MASK    S_IFMT
+        #define QT_STAT_LNK     S_IFLNK
+        #define QT_FILENO       fileno
+        #define QT_OPEN                 ::open
+        #define QT_CLOSE        ::close
+        #define QT_LSEEK        ::lseek
+        #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
+#endif
+
+        #define QT_SIGNAL_RETTYPEvoid
+        #define QT_SIGNAL_ARGS  int
+        #define QT_SIGNAL_IGNORESIG_IGN
+
+        #define QT_SOCKLEN_T    int
+
+
+#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf
new file mode 100644
index 0000000..d34912b
--- a/dev/null
+++ b/mkspecs/hpuxi-acc-64/qmake.conf
@@ -0,0 +1,124 @@
+#
+# $Id$
+#
+# qmake configuration for hpuxi-acc-64
+#
+# We define _POSIX_C_SOURCE to 199506L when using threads, therefore
+# we also need to redefine _HPUX_SOURCE.
+# From pthread(3t):
+        # Some documentation will recommend the use of -D_REENTRANT for
+        # compilation.  While this also functions properly, it is considered
+        # an obsolescent form.
+# See pthread(3t) for more details.
+#
+# From the "HP aC++ Online Programmer's Guide":
+        # When +DA2.0W is specified:
+        # * 64-bit SVR4 Executable and Linking Format (ELF) object files
+        #   are generated for PA-RISC 2.0. 
+        # * The preprocessor predefined macro, __LP64__ is defined. 
+        # * The correct path for 64-bit system and language libraries is
+        #   selected.
+        # When +DD32 is specified:
+        # * The size of an int, long, or pointer data type is 32-bits. 
+        #   The size of an int data type is 32-bits. The size of a long or
+        #   pointer data type is 64-bits.
+        # * This is the default, currently equivalent to +DA1.1 architecture.
+        # When +DD64 is specified:
+        # * The size of an int data type is 32-bits. The size of a long or
+        #   pointer data type is 64-bits.
+        # * This is currently equivalent to +DA2.OW architecture.
+        # * The preprocessor predefined macro, __LP64__ is defined.
+        # Using +DS to Specify Instruction Scheduling:
+        # * By default, the compiler performs scheduling tuned for the system
+        #   on which you are compiling, or, if specified, tuned for the setting
+        #   of the +DA option.
+#
+# From the online "C/HP-UX Reference Manual":
+        #-Aa
+        #   Enables strict ANSI C compliance.
+        # -Ae
+        #   Enables ANSI C compliance, HP value-added features (as described
+        #   for +e option), and _HPUX_SOURCE name space macro. It is equivalent
+        #   to -Aa +e -D_HPUX_SOURCE.
+        # +e
+        #   Enables the following HP value added features while compiling in
+        #   ANSI C mode: sized enum, long long, long pointers, compiler supplied
+        #   defaults for missing arguments to intrinsic calls, and $ in identifier
+        #   HP C extensions.
+#
+
+        MAKEFILE_GENERATOR= UNIX
+        TEMPLATE        = app
+        CONFIG          += qt warn_on release plugin_no_soname
+
+        QMAKE_CC        = cc
+        QMAKE_LEX       = lex
+        QMAKE_LEXFLAGS  = 
+        QMAKE_YACC      = yacc
+        QMAKE_YACCFLAGS         = -d
+        QMAKE_CFLAGS    = +DD64 +DSitanium -w $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS_WARN_ON=
+        QMAKE_CFLAGS_WARN_OFF= -w
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), +O2 +Osize)
+        QMAKE_CFLAGS_DEBUG= -g
+        QMAKE_CFLAGS_SHLIB= +Z
+        QMAKE_CFLAGS_YACC=
+        QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
+
+        QMAKE_CXX       = aCC
+        QMAKE_CXXFLAGS  = +DD64 +DSitanium -w -D__STRICT_ANSI__ -D_HPUX_SOURCE $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS_DEPS= +M
+        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_SHLIB= $$QMAKE_CFLAGS_SHLIB
+        QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
+        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
+
+        QMAKE_INCDIR    =
+        QMAKE_LIBDIR    =
+        QMAKE_INCDIR_X11= /usr/include/X11R6
+        QMAKE_LIBDIR_X11= /usr/lib/hpux64/X11R6
+        QMAKE_INCDIR_QT         = $(QTDIR)/include
+        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
+        QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
+        QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib/hpux64 /usr/contrib/X11R6/lib/hpux64
+
+        QMAKE_LINK      = aCC
+        QMAKE_LINK_SHLIB= aCC
+        QMAKE_LFLAGS    = +DD64 +DSitanium -Wl,+s $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS_RELEASE= +O2
+        QMAKE_LFLAGS_DEBUG= -g
+        QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared
+        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
+        QMAKE_LFLAGS_SONAME= -Wl,+h,
+        QMAKE_LFLAGS_THREAD=
+        QMAKE_RPATH     = 
+
+        QMAKE_LIBS      = -lm $(LIBS_EXTRA)
+        QMAKE_LIBS_DYNLOAD= -ldl
+        QMAKE_LIBS_X11  = -lXext -lX11
+        QMAKE_LIBS_X11SM= -lSM -lICE
+        QMAKE_LIBS_QT   = -lqt
+        QMAKE_LIBS_QT_THREAD= -lqt-mt
+        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt
+        QMAKE_LIBS_OPENGL_QT= -lGL -lXmu -lXt
+        QMAKE_LIBS_THREAD= -lpthread
+        QMAKE_LIBS_YACC         = -ly
+
+        QMAKE_MOC       = $(QTDIR)/bin/moc
+        QMAKE_UIC       = $(QTDIR)/bin/uic
+
+        QMAKE_AR        = ar cqs
+        QMAKE_RANLIB    =
+
+        QMAKE_TAR       = tar -cf
+        QMAKE_GZIP      = gzip -9f
+
+        QMAKE_COPY      = cp -f
+        QMAKE_MOVE      = mv -f
+        QMAKE_DEL_FILE  = rm -f
+        QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/hpuxi-acc-64/qplatformdefs.h b/mkspecs/hpuxi-acc-64/qplatformdefs.h
new file mode 100644
index 0000000..6307fc0
--- a/dev/null
+++ b/mkspecs/hpuxi-acc-64/qplatformdefs.h
@@ -0,0 +1,88 @@
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+#include <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+
+#ifdef QT_THREAD_SUPPORT
+#include <pthread.h>
+#endif
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#include <dl.h>
+#define QT_HPUX_LD
+#define QT_NO_LIBRARY_UNLOAD
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+// DNS header files are not fully covered by X/Open specifications.
+// In particular nothing is said about res_* :/
+// #ifdef __cplusplus
+// extern "C" {
+// #endif
+// getres() is mangled because of missing extern "C" on
+// HP-UX 11.x systems missing PHCO_23963
+#include <resolv.h>
+// #ifdef __cplusplus
+// }
+// #endif
+// Undeclared - at least on HP-UX 10.20.
+extern "C" int res_init();
+
+
+#if !defined(QT_NO_COMPAT)
+        #define QT_STATBUF      struct stat
+        #define QT_STATBUF4TSTATstruct stat
+        #define QT_STAT                 ::stat
+        #define QT_FSTAT        ::fstat
+        #define QT_STAT_REG     S_IFREG
+        #define QT_STAT_DIR     S_IFDIR
+        #define QT_STAT_MASK    S_IFMT
+        #define QT_STAT_LNK     S_IFLNK
+        #define QT_FILENO       fileno
+        #define QT_OPEN                 ::open
+        #define QT_CLOSE        ::close
+        #define QT_LSEEK        ::lseek
+        #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
+#endif
+
+        #define QT_SIGNAL_RETTYPEvoid
+        #define QT_SIGNAL_ARGS  int
+        #define QT_SIGNAL_IGNORESIG_IGN
+
+        #define QT_SOCKLEN_T    int
+
+
+#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf
index b86f93b..a08c3d1 100644
--- a/mkspecs/hurd-g++/qmake.conf
+++ b/mkspecs/hurd-g++/qmake.conf
@@ -4,12 +4,12 @@
 # qmake configuration for hurd-g++
 #
 # Submitted by uch@nop.or.jp as "gnu-g++".
-# Renamed to "hurd-g++" because people were confusing gnu with linux.
+# Renamed to "hurd-g++" because people were confusing GNU/Hurd with GNU/Linux.
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
@@ -74,4 +74,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
-
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf
index 8035658..be50743 100644
--- a/mkspecs/irix-cc-64/qmake.conf
+++ b/mkspecs/irix-cc-64/qmake.conf
@@ -1,7 +1,7 @@
 #
 # $Id$
 #
-# qmake configuration for irix-64
+# qmake configuration for irix-cc-64
 #
 # From cc(1):
         # -64
@@ -38,7 +38,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
@@ -56,7 +56,7 @@ QMAKE_CFLAGS_YACC	= -woff 1110,1174,3262
         QMAKE_CFLAGS_THREAD=
 
         QMAKE_CXX       = CC
-        QMAKE_CXXFLAGS  = -64 -woff 1021,1209,1233,1314,1355,1375,1506,1681,1682,3496 $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS  = -64 -woff 1021,1209,1233,1314,1355,1375,1424,1506,1681,1682,3496 $(CXXFLAGS_EXTRA)
         QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
@@ -111,3 +111,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/irix-cc-64/qplatformdefs.h b/mkspecs/irix-cc-64/qplatformdefs.h
index c6eaa2f..8666daf 100644
--- a/mkspecs/irix-cc-64/qplatformdefs.h
+++ b/mkspecs/irix-cc-64/qplatformdefs.h
@@ -75,7 +75,11 @@
         #define QT_SIGNAL_ARGS  int
         #define QT_SIGNAL_IGNORESIG_IGN
 
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500)
+        #define QT_SOCKLEN_T    size_t
+#else
         #define QT_SOCKLEN_T    int
+#endif
 
 #if 0
 // on Irix 6.5 and better only - but how to check for it?
diff --git a/mkspecs/irix-cc-o32/qmake.conf b/mkspecs/irix-cc-o32/qmake.conf
index 75114a5..a731849 100644
--- a/mkspecs/irix-cc-o32/qmake.conf
+++ b/mkspecs/irix-cc-o32/qmake.conf
@@ -1,7 +1,7 @@
 #
 # $Id$
 #
-# qmake configuration for irix-o32
+# qmake configuration for irix-cc-o32
 #
 # From cc(1):
         # -o32 or -32
@@ -12,7 +12,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
@@ -20,7 +20,7 @@ QMAKE_LEXFLAGS		=
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS_DEPS= -M
-        QMAKE_CFLAGS    = -o32 -woff 3203,3260,3672 $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS    = -o32 -woff 3115,3203,3260,3672,3937 $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_WARN_ON= -fullwarn
         QMAKE_CFLAGS_WARN_OFF=
         QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -Olimit 3000)
@@ -85,3 +85,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf
index 31411af..469a473 100644
--- a/mkspecs/irix-cc/qmake.conf
+++ b/mkspecs/irix-cc/qmake.conf
@@ -1,7 +1,7 @@
 #
 # $Id$
 #
-# qmake configuration for irix-n32
+# qmake configuration for irix-cc
 #
 # From cc(1):
         # -n32
@@ -38,7 +38,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
@@ -56,7 +56,7 @@ QMAKE_CFLAGS_YACC	= -woff 1110,1174,3262
         QMAKE_CFLAGS_THREAD=
 
         QMAKE_CXX       = CC
-        QMAKE_CXXFLAGS  = -n32 -woff 1021,1209,1233,1314,1355,1375,1506,1681,1682,3496 $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS  = -n32 -woff 1021,1209,1233,1314,1355,1375,1424,1506,1681,1682,3496 $(CXXFLAGS_EXTRA)
         QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
@@ -111,3 +111,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/irix-cc/qplatformdefs.h b/mkspecs/irix-cc/qplatformdefs.h
index c6eaa2f..8666daf 100644
--- a/mkspecs/irix-cc/qplatformdefs.h
+++ b/mkspecs/irix-cc/qplatformdefs.h
@@ -75,7 +75,11 @@
         #define QT_SIGNAL_ARGS  int
         #define QT_SIGNAL_IGNORESIG_IGN
 
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500)
+        #define QT_SOCKLEN_T    size_t
+#else
         #define QT_SOCKLEN_T    int
+#endif
 
 #if 0
 // on Irix 6.5 and better only - but how to check for it?
diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf
index 17b6751..fa4422e 100644
--- a/mkspecs/irix-g++/qmake.conf
+++ b/mkspecs/irix-g++/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
@@ -48,13 +48,13 @@ QMAKE_LINK_SHLIB	= g++
         QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
-        QMAKE_LFLAGS_SHLIB= -shared
+        QMAKE_LFLAGS_SHLIB= -shared -Wl,-LD_LAYOUT:lgot_buffer=1000
         QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME= -Wl,-soname,
         QMAKE_LFLAGS_THREAD=
         QMAKE_RPATH     = -Wl,-rpath,
 
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = -lC $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD=
         QMAKE_LIBS_X11  = -lXext -lX11 -lm
         QMAKE_LIBS_X11SM= -lSM -lICE
@@ -63,7 +63,7 @@ QMAKE_LIBS_QT_THREAD	= -lqt-mt
 # libGLU is using the SGI C++ library internally and this somehow clashes
 # with the GNU C++ library (similar name mangling and symbol names?)
 # so we add -lC so that the SGI C++ library is used first...
-        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lC
+        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
         QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
         QMAKE_LIBS_THREAD= -lpthread
 
@@ -82,3 +82,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/irix-g++/qplatformdefs.h b/mkspecs/irix-g++/qplatformdefs.h
index 757afcc..dc47a03 100644
--- a/mkspecs/irix-g++/qplatformdefs.h
+++ b/mkspecs/irix-g++/qplatformdefs.h
@@ -79,7 +79,11 @@
 #endif
         #define QT_SIGNAL_IGNORESIG_IGN
 
-        #define QT_SOCKLEN_T            int
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500)
+        #define QT_SOCKLEN_T    size_t
+#else
+        #define QT_SOCKLEN_T    int
+#endif
 
 #if 0
 // on Irix 6.5 and better only - but how to check for it?
diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
index 6936fc9..f5d60dc 100644
--- a/mkspecs/linux-cxx/qmake.conf
+++ b/mkspecs/linux-cxx/qmake.conf
@@ -1,12 +1,14 @@
 #
 # $Id$
 #
-# qmake configuration for Compaq C++ for Linux on Alpha
+# qmake configuration for linux-cxx
+#
+# Written for Compaq C++ for GNU/Linux on Alpha (discontinued).
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = ccc
         QMAKE_LEX       = flex
@@ -73,3 +75,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf
new file mode 100644
index 0000000..4916ff1
--- a/dev/null
+++ b/mkspecs/linux-ecc-64/qmake.conf
@@ -0,0 +1,86 @@
+#
+# $Id$
+#
+# qmake configuration for linux-ecc-64
+#
+# Written for Intel C++ 7.1, and 8.0 for Linux.
+#
+
+        MAKEFILE_GENERATOR= UNIX
+        TEMPLATE        = app
+        CONFIG          += qt warn_on release link_prl
+
+        QMAKE_CC        = ecc
+        QMAKE_LEX       = flex
+        QMAKE_LEXFLAGS  = 
+        QMAKE_YACC      = yacc
+        QMAKE_YACCFLAGS         = -d
+        QMAKE_CFLAGS    = $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS_DEPS= -M
+        QMAKE_CFLAGS_WARN_ON=
+        QMAKE_CFLAGS_WARN_OFF= -w
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
+        QMAKE_CFLAGS_DEBUG= -g
+        QMAKE_CFLAGS_SHLIB= -KPIC
+        QMAKE_CFLAGS_YACC=
+        QMAKE_CFLAGS_THREAD= -D_REENTRANT
+
+        QMAKE_CXX       = ecpc
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
+        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_SHLIB= $$QMAKE_CFLAGS_SHLIB
+        QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
+        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
+
+        QMAKE_INCDIR    =
+        QMAKE_LIBDIR    =
+        QMAKE_INCDIR_X11= /usr/X11R6/include
+        QMAKE_LIBDIR_X11= /usr/X11R6/lib
+        QMAKE_INCDIR_QT         = $(QTDIR)/include
+        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
+        QMAKE_INCDIR_OPENGL= /usr/X11R6/include
+        QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
+
+        QMAKE_LINK      = ecpc
+        QMAKE_LINK_SHLIB= ecpc
+        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS_RELEASE=
+        QMAKE_LFLAGS_DEBUG=
+        QMAKE_LFLAGS_SHLIB= -shared
+        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
+        QMAKE_LFLAGS_SONAME= -Qoption,ld,-soname,
+        QMAKE_LFLAGS_THREAD=
+        QMAKE_RPATH     = -Qoption,ld,-rpath,
+
+        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS_DYNLOAD= -ldl
+        QMAKE_LIBS_X11  = -lXext -lX11 -lm
+        QMAKE_LIBS_X11SM= -lSM -lICE
+        QMAKE_LIBS_NIS  = -lnsl
+        QMAKE_LIBS_QT   = -lqt
+        QMAKE_LIBS_QT_THREAD= -lqt-mt
+        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
+        QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
+        QMAKE_LIBS_THREAD= -lpthread
+
+        QMAKE_MOC       = $(QTDIR)/bin/moc
+        QMAKE_UIC       = $(QTDIR)/bin/uic
+
+        QMAKE_AR        = ar cqs
+        QMAKE_RANLIB    =
+
+        QMAKE_CLEAN     = -r $(OBJECTS_DIR)/ti_files
+
+        QMAKE_TAR       = tar -cf
+        QMAKE_GZIP      = gzip -9f
+
+        QMAKE_COPY      = cp -f
+        QMAKE_MOVE      = mv -f
+        QMAKE_DEL_FILE  = rm -f
+        QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/linux-ecc-64/qplatformdefs.h b/mkspecs/linux-ecc-64/qplatformdefs.h
new file mode 100644
index 0000000..e25bc1e
--- a/dev/null
+++ b/mkspecs/linux-ecc-64/qplatformdefs.h
@@ -0,0 +1,106 @@
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// DNS system header files are a mess!
+// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
+// 'u_char' and includes <sys/types.h>.  Now the problem is that
+// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
+// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
+#endif
+
+#include <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+
+#ifdef QT_THREAD_SUPPORT
+#include <pthread.h>
+#endif
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#include <dlfcn.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+// DNS header files are not fully covered by X/Open specifications.
+// In particular nothing is said about res_* :/
+// Header files <netinet/in.h> and <arpa/nameser.h> are not included
+// by <resolv.h> on older versions of the GNU C library. Note that
+// <arpa/nameser.h> must be included before <resolv.h>.
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+
+
+#if !defined(QT_NO_COMPAT)
+        #define QT_STATBUF      struct stat
+        #define QT_STATBUF4TSTATstruct stat
+        #define QT_STAT                 ::stat
+        #define QT_FSTAT        ::fstat
+        #define QT_STAT_REG     S_IFREG
+        #define QT_STAT_DIR     S_IFDIR
+        #define QT_STAT_MASK    S_IFMT
+        #define QT_STAT_LNK     S_IFLNK
+        #define QT_FILENO       fileno
+        #define QT_OPEN                 ::open
+        #define QT_CLOSE        ::close
+        #define QT_LSEEK        ::lseek
+        #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
+#endif
+
+        #define QT_SIGNAL_RETTYPEvoid
+        #define QT_SIGNAL_ARGS  int
+        #define QT_SIGNAL_IGNORESIG_IGN
+
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+        #define QT_SOCKLEN_T    socklen_t
+#else
+        #define QT_SOCKLEN_T    int
+#endif
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+        #define QT_SNPRINTF     ::snprintf
+        #define QT_VSNPRINTF    ::vsnprintf
+#endif
+
+
+#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf
new file mode 100644
index 0000000..39b018f
--- a/dev/null
+++ b/mkspecs/linux-g++-64/qmake.conf
@@ -0,0 +1,90 @@
+#
+# $Id$
+#
+# qmake configuration for linux-g++
+#
+# mkspec for platforms that have both lib and lib64
+# directories, like the AMD Opteron.
+#
+
+        MAKEFILE_GENERATOR= UNIX
+        TEMPLATE        = app
+        CONFIG          += qt warn_on release incremental link_prl
+QMAKE_INCREMENTAL_STYLE = sublib
+
+        QMAKE_CC        = gcc
+        QMAKE_LEX       = flex
+        QMAKE_LEXFLAGS  =
+        QMAKE_YACC      = yacc
+        QMAKE_YACCFLAGS         = -d
+        QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS_DEPS= -M
+        QMAKE_CFLAGS_WARN_ON= -Wall -W
+        QMAKE_CFLAGS_WARN_OFF= -w
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
+        QMAKE_CFLAGS_DEBUG= -g
+        QMAKE_CFLAGS_SHLIB= -fPIC
+        QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
+        QMAKE_CFLAGS_THREAD= -D_REENTRANT
+
+        QMAKE_CXX       = g++
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
+        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_SHLIB= $$QMAKE_CFLAGS_SHLIB
+        QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
+        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
+
+        QMAKE_INCDIR    =
+        QMAKE_LIBDIR    =
+        QMAKE_INCDIR_X11= /usr/X11R6/include
+        QMAKE_LIBDIR_X11= /usr/X11R6/lib64
+        QMAKE_INCDIR_QT         = $(QTDIR)/include
+        QMAKE_LIBDIR_QT         = $(QTDIR)/lib64
+        QMAKE_INCDIR_OPENGL= /usr/X11R6/include
+        QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib64
+
+        QMAKE_LINK      = g++
+        QMAKE_LINK_SHLIB= g++
+        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS_RELEASE=
+        QMAKE_LFLAGS_DEBUG=
+        QMAKE_LFLAGS_SHLIB= -shared
+        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
+        QMAKE_LFLAGS_SONAME= -Wl,-soname,
+        QMAKE_LFLAGS_THREAD=
+        QMAKE_RPATH     = -Wl,-rpath,
+
+        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS_DYNLOAD= -ldl
+        QMAKE_LIBS_X11  = -lXext -lX11 -lm
+        QMAKE_LIBS_X11SM= -lSM -lICE
+        QMAKE_LIBS_NIS  = -lnsl
+        QMAKE_LIBS_QT   = -lqt
+        QMAKE_LIBS_QT_THREAD= -lqt-mt
+        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
+        QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
+        QMAKE_LIBS_THREAD= -lpthread
+
+        QMAKE_MOC       = $(QTDIR)/bin/moc
+        QMAKE_UIC       = $(QTDIR)/bin/uic
+
+        QMAKE_AR        = ar cqs
+        QMAKE_RANLIB    =
+
+        QMAKE_TAR       = tar -cf
+        QMAKE_GZIP      = gzip -9f
+
+        QMAKE_COPY      = cp -f
+QMAKE_COPY_FILE         = $(COPY)
+QMAKE_COPY_DIR          = $(COPY) -r
+        QMAKE_MOVE      = mv -f
+        QMAKE_DEL_FILE  = rm -f
+        QMAKE_DEL_DIR   = rmdir
+QMAKE_STRIP             = strip
+        QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/linux-g++-64/qplatformdefs.h b/mkspecs/linux-g++-64/qplatformdefs.h
new file mode 100644
index 0000000..e25bc1e
--- a/dev/null
+++ b/mkspecs/linux-g++-64/qplatformdefs.h
@@ -0,0 +1,106 @@
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// DNS system header files are a mess!
+// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
+// 'u_char' and includes <sys/types.h>.  Now the problem is that
+// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
+// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
+#endif
+
+#include <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+
+#ifdef QT_THREAD_SUPPORT
+#include <pthread.h>
+#endif
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#include <dlfcn.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+// DNS header files are not fully covered by X/Open specifications.
+// In particular nothing is said about res_* :/
+// Header files <netinet/in.h> and <arpa/nameser.h> are not included
+// by <resolv.h> on older versions of the GNU C library. Note that
+// <arpa/nameser.h> must be included before <resolv.h>.
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+
+
+#if !defined(QT_NO_COMPAT)
+        #define QT_STATBUF      struct stat
+        #define QT_STATBUF4TSTATstruct stat
+        #define QT_STAT                 ::stat
+        #define QT_FSTAT        ::fstat
+        #define QT_STAT_REG     S_IFREG
+        #define QT_STAT_DIR     S_IFDIR
+        #define QT_STAT_MASK    S_IFMT
+        #define QT_STAT_LNK     S_IFLNK
+        #define QT_FILENO       fileno
+        #define QT_OPEN                 ::open
+        #define QT_CLOSE        ::close
+        #define QT_LSEEK        ::lseek
+        #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
+#endif
+
+        #define QT_SIGNAL_RETTYPEvoid
+        #define QT_SIGNAL_ARGS  int
+        #define QT_SIGNAL_IGNORESIG_IGN
+
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+        #define QT_SOCKLEN_T    socklen_t
+#else
+        #define QT_SOCKLEN_T    int
+#endif
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+        #define QT_SNPRINTF     ::snprintf
+        #define QT_VSNPRINTF    ::vsnprintf
+#endif
+
+
+#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf
index 37a3f6e..882168a 100644
--- a/mkspecs/linux-g++/qmake.conf
+++ b/mkspecs/linux-g++/qmake.conf
@@ -6,14 +6,17 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release incremental
-QMAKE_INCREMENTAL_STYLE  = sublib
+        CONFIG          += qt warn_on release incremental link_prl
+QMAKE_INCREMENTAL_STYLE = sublib
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  = 
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
+QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
+QMAKE_YACC_HEADER       = $base.tab.h
+QMAKE_YACC_SOURCE       = $base.tab.c
         QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_DEPS= -M
         QMAKE_CFLAGS_WARN_ON= -Wall -W
@@ -76,7 +79,12 @@ QMAKE_TAR		= tar -cf
         QMAKE_GZIP      = gzip -9f
 
         QMAKE_COPY      = cp -f
+QMAKE_COPY_FILE         = $(COPY)
+QMAKE_COPY_DIR          = $(COPY) -r
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
 QMAKE_STRIP             = strip
+        QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index 9dc7480..5fcd96b 100644
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -1,12 +1,14 @@
 #
 # $Id$
 #
-# qmake configuration for Intel C++ 5.0.1, 6.0, and 7.0 for Linux
+# qmake configuration for linux-icc
+#
+# Written for Intel C++ 5.0.1, 6.0.1, 7.0, and 8.0 for Linux.
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = icc
         QMAKE_LEX       = flex
@@ -80,3 +82,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
index 5a2a670..30580b8 100644
--- a/mkspecs/linux-kcc/qmake.conf
+++ b/mkspecs/linux-kcc/qmake.conf
@@ -1,7 +1,9 @@
 #
 # $Id$
 #
-# qmake configuration for KAI C++ 4.0f for Linux
+# qmake configuration for linux-kcc
+#
+# Written for KAI C++ 4.0f for GNU/Linux (discontinued).
 #
 # From the KAI C++ man page for Linux:
 # --[no_]thread_safe
@@ -13,7 +15,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = KCC
         QMAKE_LEX       = flex
@@ -87,3 +89,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/linux-kylix/qmake.conf b/mkspecs/linux-kylix/qmake.conf
new file mode 100644
index 0000000..dfbf8e7
--- a/dev/null
+++ b/mkspecs/linux-kylix/qmake.conf
@@ -0,0 +1,84 @@
+#
+# $Id$
+#
+# qmake configuration for linux-kylix
+#
+
+        MAKEFILE_GENERATOR= UNIX
+        TEMPLATE        = app
+        CONFIG          += qt warn_on release incremental link_prl
+        QMAKE_INCREMENTAL_STYLE= sublib
+
+        QMAKE_CC        = bc++
+        QMAKE_LEX       = flex
+        QMAKE_LEXFLAGS  = 
+        QMAKE_YACC      = yacc
+        QMAKE_YACCFLAGS         = -d
+        QMAKE_CFLAGS    = $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS_DEPS= -m
+        QMAKE_CFLAGS_WARN_ON= -w
+        QMAKE_CFLAGS_WARN_OFF= -w-
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
+        QMAKE_CFLAGS_DEBUG= -v -y
+        QMAKE_CFLAGS_SHLIB=
+        QMAKE_CFLAGS_YACC=
+        QMAKE_CFLAGS_THREAD=
+
+        QMAKE_CXX       = bc++
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -P $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
+        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_SHLIB= $$QMAKE_CFLAGS_SHLIB
+        QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
+        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
+
+        QMAKE_INCDIR    =
+        QMAKE_LIBDIR    =
+        QMAKE_INCDIR_X11= /usr/X11R6/include
+        QMAKE_LIBDIR_X11= /usr/X11R6/lib
+        QMAKE_INCDIR_QT         = $(QTDIR)/include
+        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
+        QMAKE_INCDIR_OPENGL= /usr/X11R6/include
+        QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
+
+        QMAKE_LINK      = bc++
+        QMAKE_LINK_SHLIB= bc++
+        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS_RELEASE=
+        QMAKE_LFLAGS_DEBUG= -lv -ly
+        QMAKE_LFLAGS_SHLIB= -ltD -lTpd
+        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
+        QMAKE_LFLAGS_SONAME= -lN
+        QMAKE_LFLAGS_THREAD=
+        QMAKE_RPATH     =
+
+        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS_DYNLOAD= -llibdl
+        QMAKE_LIBS_X11  = -llibXext -llibX11 -llibm
+        QMAKE_LIBS_X11SM= -llibSM -llibICE
+        QMAKE_LIBS_NIS  = -llibnsl
+        QMAKE_LIBS_QT   = -llibqt
+        QMAKE_LIBS_QT_THREAD= -llibqt-mt
+        QMAKE_LIBS_OPENGL= -llibGLU -llibGL -llibXmu
+        QMAKE_LIBS_OPENGL_QT= -llibGL -llibXmu
+        QMAKE_LIBS_THREAD= -llibpthread
+
+        QMAKE_MOC       = $(QTDIR)/bin/moc
+        QMAKE_UIC       = $(QTDIR)/bin/uic
+
+        QMAKE_AR        = ar cqs
+        QMAKE_RANLIB    =
+
+        QMAKE_TAR       = tar -cf
+        QMAKE_GZIP      = gzip -9f
+
+        QMAKE_COPY      = cp -f
+        QMAKE_MOVE      = mv -f
+        QMAKE_DEL_FILE  = rm -f
+        QMAKE_DEL_DIR   = rmdir
+QMAKE_STRIP             = strip
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/linux-kylix/qplatformdefs.h b/mkspecs/linux-kylix/qplatformdefs.h
new file mode 100644
index 0000000..e25bc1e
--- a/dev/null
+++ b/mkspecs/linux-kylix/qplatformdefs.h
@@ -0,0 +1,106 @@
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// DNS system header files are a mess!
+// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
+// 'u_char' and includes <sys/types.h>.  Now the problem is that
+// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
+// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
+#endif
+
+#include <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+
+#ifdef QT_THREAD_SUPPORT
+#include <pthread.h>
+#endif
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#include <dlfcn.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+// DNS header files are not fully covered by X/Open specifications.
+// In particular nothing is said about res_* :/
+// Header files <netinet/in.h> and <arpa/nameser.h> are not included
+// by <resolv.h> on older versions of the GNU C library. Note that
+// <arpa/nameser.h> must be included before <resolv.h>.
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+
+
+#if !defined(QT_NO_COMPAT)
+        #define QT_STATBUF      struct stat
+        #define QT_STATBUF4TSTATstruct stat
+        #define QT_STAT                 ::stat
+        #define QT_FSTAT        ::fstat
+        #define QT_STAT_REG     S_IFREG
+        #define QT_STAT_DIR     S_IFDIR
+        #define QT_STAT_MASK    S_IFMT
+        #define QT_STAT_LNK     S_IFLNK
+        #define QT_FILENO       fileno
+        #define QT_OPEN                 ::open
+        #define QT_CLOSE        ::close
+        #define QT_LSEEK        ::lseek
+        #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
+#endif
+
+        #define QT_SIGNAL_RETTYPEvoid
+        #define QT_SIGNAL_ARGS  int
+        #define QT_SIGNAL_IGNORESIG_IGN
+
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+        #define QT_SOCKLEN_T    socklen_t
+#else
+        #define QT_SOCKLEN_T    int
+#endif
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+        #define QT_SNPRINTF     ::snprintf
+        #define QT_VSNPRINTF    ::vsnprintf
+#endif
+
+
+#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
index a200f69..f416183 100644
--- a/mkspecs/linux-pgcc/qmake.conf
+++ b/mkspecs/linux-pgcc/qmake.conf
@@ -1,12 +1,14 @@
 #
 # $Id$
 #
-# qmake configuration for Portland Group C++ for Intel
+# qmake configuration for linux-pgcc
+#
+# Written for Portland Group C++ for Intel.
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = pgcc
         QMAKE_LEX       = flex
@@ -78,3 +80,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf
new file mode 100644
index 0000000..12364c1
--- a/dev/null
+++ b/mkspecs/lynxos-g++/qmake.conf
@@ -0,0 +1,87 @@
+#
+# $Id$
+#
+# qmake configuration for lynxos-g++
+#
+# Written for LynxOS 4.0.
+#
+
+        MAKEFILE_GENERATOR= UNIX
+        TEMPLATE        = app
+        CONFIG          += qt warn_on release incremental link_prl
+QMAKE_INCREMENTAL_STYLE = sublib
+
+        QMAKE_CC        = gcc
+        QMAKE_LEX       = flex
+        QMAKE_LEXFLAGS  = 
+        QMAKE_YACC      = yacc
+        QMAKE_YACCFLAGS         = -d
+        QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS_DEPS= -M
+        QMAKE_CFLAGS_WARN_ON= -Wall -W
+        QMAKE_CFLAGS_WARN_OFF= -w
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
+        QMAKE_CFLAGS_DEBUG= -g
+        QMAKE_CFLAGS_SHLIB= -fPIC
+        QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
+        QMAKE_CFLAGS_THREAD= -D_REENTRANT
+
+        QMAKE_CXX       = g++
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
+        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_SHLIB= $$QMAKE_CFLAGS_SHLIB
+        QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
+        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
+
+        QMAKE_INCDIR    =
+        QMAKE_LIBDIR    =
+        QMAKE_INCDIR_X11= /usr/include/X11
+        QMAKE_LIBDIR_X11=
+        QMAKE_INCDIR_QT         = $(QTDIR)/include
+        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
+        QMAKE_INCDIR_OPENGL= /usr/include/GL
+        QMAKE_LIBDIR_OPENGL=
+
+        QMAKE_LINK      = g++
+        QMAKE_LINK_SHLIB= g++
+        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS_RELEASE=
+        QMAKE_LFLAGS_DEBUG=
+        QMAKE_LFLAGS_SHLIB= -shared
+        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
+        QMAKE_LFLAGS_SONAME= -Wl,-soname,
+        QMAKE_LFLAGS_THREAD=
+        QMAKE_RPATH     = -Wl,-rpath,
+
+        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS_DYNLOAD= -ldl
+        QMAKE_LIBS_X11  = -lXext -lX11 -lm
+        QMAKE_LIBS_X11SM= -lSM -lICE
+        QMAKE_LIBS_NIS  = -lnsl
+        QMAKE_LIBS_QT   = -lqt
+        QMAKE_LIBS_QT_THREAD= -lqt-mt
+        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
+        QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
+        QMAKE_LIBS_THREAD= -lpthread
+
+        QMAKE_MOC       = $(QTDIR)/bin/moc
+        QMAKE_UIC       = $(QTDIR)/bin/uic
+
+        QMAKE_AR        = ar cqs
+        QMAKE_RANLIB    =
+
+        QMAKE_TAR       = tar -cf
+        QMAKE_GZIP      = gzip -9f
+
+        QMAKE_COPY      = cp -f
+        QMAKE_MOVE      = mv -f
+        QMAKE_DEL_FILE  = rm -f
+        QMAKE_DEL_DIR   = rmdir
+QMAKE_STRIP             = strip
+        QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/lynxos-g++/qplatformdefs.h b/mkspecs/lynxos-g++/qplatformdefs.h
new file mode 100644
index 0000000..56f4be6
--- a/dev/null
+++ b/mkspecs/lynxos-g++/qplatformdefs.h
@@ -0,0 +1,91 @@
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+#include <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+
+#ifdef QT_THREAD_SUPPORT
+#include <pthread.h>
+#endif
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#include <dlfcn.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+// DNS header files are not fully covered by X/Open specifications.
+// In particular nothing is said about res_* :/
+// Header files <netinet/in.h> and <arpa/nameser.h> are not included
+// by <resolv.h> on older versions of the GNU C library. Note that
+// <arpa/nameser.h> must be included before <resolv.h>.
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+
+
+#if !defined(QT_NO_COMPAT)
+        #define QT_STATBUF      struct stat
+        #define QT_STATBUF4TSTATstruct stat
+        #define QT_STAT                 ::stat
+        #define QT_FSTAT        ::fstat
+        #define QT_STAT_REG     S_IFREG
+        #define QT_STAT_DIR     S_IFDIR
+        #define QT_STAT_MASK    S_IFMT
+        #define QT_STAT_LNK     S_IFLNK
+        #define QT_FILENO       fileno
+        #define QT_OPEN                 ::open
+        #define QT_CLOSE        ::close
+        #define QT_LSEEK        ::lseek
+        #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
+#endif
+
+        #define QT_SIGNAL_RETTYPEvoid
+        #define QT_SIGNAL_ARGS  int
+        #define QT_SIGNAL_IGNORESIG_IGN
+
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+        #define QT_SOCKLEN_T    socklen_t
+#else
+        #define QT_SOCKLEN_T    int
+#endif
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+        #define QT_SNPRINTF     ::snprintf
+        #define QT_VSNPRINTF    ::vsnprintf
+#endif
+
+
+#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/macx-g++/Info.plist.app b/mkspecs/macx-g++/Info.plist.app
index 9d6c42a..4da07e9 100644
--- a/mkspecs/macx-g++/Info.plist.app
+++ b/mkspecs/macx-g++/Info.plist.app
@@ -3,13 +3,15 @@
 <plist version="0.9">
 <dict>
         <key>CFBundleIconFile</key>
-        <string>application.icns</string>
+        <string>@ICON@</string>
         <key>CFBundlePackageType</key>
         <string>APPL</string>
         <key>CFBundleGetInfoString</key>
         <string>Created by Qt/QMake</string>
         <key>CFBundleSignature</key>
         <string>ttxt</string>
+        <key>CFBundleExecutable</key>
+        <string>@EXECUTABLE@</string>
         <key>NOTE</key>
         <string>Please, do NOT change this file -- It was generated by Qt/QMake.</string>
 </dict>
diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf
index dc8da5c..67bc525 100644
--- a/mkspecs/macx-g++/qmake.conf
+++ b/mkspecs/macx-g++/qmake.conf
@@ -6,26 +6,29 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release resource_fork incremental global_init_link_order lib_version_first plugin_no_soname
+        CONFIG          += qt warn_on release resource_fork incremental global_init_link_order lib_version_first plugin_no_soname link_prl
 QMAKE_INCREMENTAL_STYLE = sublibs
 
-        QMAKE_CC        = $(TB)cc
+        QMAKE_CC        = cc
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  = 
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
+QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
+QMAKE_YACC_HEADER       = $base.tab.h
+QMAKE_YACC_SOURCE       = $base.tab.c
         QMAKE_RESOURCE  = /Developer/Tools/Rez
         QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_DEPS= -M
         QMAKE_CFLAGS_WARN_ON= -Wall -W
         QMAKE_CFLAGS_WARN_OFF= -w
-        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -Os)
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB= -fPIC
         QMAKE_EXTENSION_SHLIB= dylib
         QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
 
-        QMAKE_CXX       = $(TB)c++
+        QMAKE_CXX       = c++
         QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
         QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
@@ -35,7 +38,6 @@ QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
         QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
         QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
 
-        QMAKE_INCDIR    = /usr/local/include
         QMAKE_LIBDIR    =
         QMAKE_INCDIR_QT         = $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
@@ -44,16 +46,22 @@ QMAKE_INCDIR_OPENGL	= /System/Library/Frameworks/OpenGL.framework/Headers \
 
         QMAKE_LINK      = $$QMAKE_CXX
         QMAKE_LINK_SHLIB= $$QMAKE_CXX
-        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
-#QMAKE_LFLAGS_PREBIND    = -prebind -seg1addr 0x90000000
+        QMAKE_LFLAGS    = -headerpad_max_install_names $(LFLAGS_EXTRA)
+#QMAKE_LFLAGS_PREBIND    = -seg1addr 0x90000000
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
-        QMAKE_LFLAGS_SHAPP= -prebind
-        QMAKE_LFLAGS_SHLIB= -dynamiclib 
+        QMAKE_LFLAGS_APP= -prebind
+        QMAKE_LFLAGS_SHLIB= -prebind -dynamiclib 
 QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace
         QMAKE_LFLAGS_PLUGIN= -bundle
-        QMAKE_LFLAGS_SONAME= -install_name$${LITERAL_WHITESPACE}@executable_path/../Frameworks/
+#You probably don't want to mess with this, instead look at install_name_tool(1)
+        #QMAKE_LFLAGS_SONAME= -install_name$${LITERAL_WHITESPACE}@executable_path/../Frameworks/
+        QMAKE_LFLAGS_SONAME= -install_name$${LITERAL_WHITESPACE}
         QMAKE_LFLAGS_THREAD= 
+
+QMAKE_LFLAGS_VERSION    = -current_version$${LITERAL_WHITESPACE}
+QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE}
+
         QMAKE_RPATH     = 
 
         QMAKE_LIBS_DYNLOAD=
@@ -78,3 +86,5 @@ QMAKE_COPY_DIR		= $$QMAKE_COPY -r
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/macx-mwerks/qmake.conf b/mkspecs/macx-mwerks/qmake.conf
index 15f4325..ad9b47d 100644
--- a/mkspecs/macx-mwerks/qmake.conf
+++ b/mkspecs/macx-mwerks/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= METROWERKS
         TEMPLATE        = app
-        CONFIG          += qt release warn_off separate_volume
+        CONFIG          += qt release warn_off separate_volume link_prl
 
         DEFINES                 += QT_NO_STL __MACOSX__ __CF_USE_FRAMEWORK_INCLUDES__
 
@@ -16,7 +16,7 @@ QMAKE_VOLUMENAME	= OS X Volume
         FRAMEWORKPATH   = {System}/Library/Frameworks/
         QMAKE_CRT_OBJECTS= crt1.o
         QMAKE_INCDIR_QT         = $(QTDIR)/include
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = -framework System $(LIBS_EXTRA)
         QMAKE_LIBS_QT   = -L$(QTDIR)/lib/ -lqt 
         QMAKE_INCDIR_OPENGL= /System/Library/Frameworks/OpenGL.framework/Headers \
         /System/Library/Frameworks/AGL.framework/Headers/
diff --git a/mkspecs/macx-pbuilder/Info.plist.app b/mkspecs/macx-pbuilder/Info.plist.app
index 9d6c42a..4da07e9 100755
--- a/mkspecs/macx-pbuilder/Info.plist.app
+++ b/mkspecs/macx-pbuilder/Info.plist.app
@@ -3,13 +3,15 @@
 <plist version="0.9">
 <dict>
         <key>CFBundleIconFile</key>
-        <string>application.icns</string>
+        <string>@ICON@</string>
         <key>CFBundlePackageType</key>
         <string>APPL</string>
         <key>CFBundleGetInfoString</key>
         <string>Created by Qt/QMake</string>
         <key>CFBundleSignature</key>
         <string>ttxt</string>
+        <key>CFBundleExecutable</key>
+        <string>@EXECUTABLE@</string>
         <key>NOTE</key>
         <string>Please, do NOT change this file -- It was generated by Qt/QMake.</string>
 </dict>
diff --git a/mkspecs/macx-pbuilder/qmake.conf b/mkspecs/macx-pbuilder/qmake.conf
index 6d765a8..da820ac 100755
--- a/mkspecs/macx-pbuilder/qmake.conf
+++ b/mkspecs/macx-pbuilder/qmake.conf
@@ -6,9 +6,9 @@
 
         MAKEFILE_GENERATOR= PROJECTBUILDER
         TEMPLATE        = app
-        CONFIG          += qt warn_on release lib_version_first incremental resource_fork plugin_no_soname
+        CONFIG          += qt warn_on release lib_version_first incremental plugin_no_soname link_prl
 
-        QMAKE_CC        = cc
+        QMAKE_CC        = 
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  = 
         QMAKE_YACC      = yacc
@@ -18,13 +18,13 @@ QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_DEPS= -M
         QMAKE_CFLAGS_WARN_ON= -Wall -W
         QMAKE_CFLAGS_WARN_OFF=
-        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3)
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -Os)
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB= -fPIC
         QMAKE_EXTENSION_SHLIB= dylib
         QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
 
-        QMAKE_CXX       = c++
+        QMAKE_CXX       = 
         QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
         QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
@@ -47,11 +47,11 @@ QMAKE_LINK_SHLIB	= c++
         QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
-        QMAKE_LFLAGS_SHAPP= -prebind
+        QMAKE_LFLAGS_APP= -prebind
         QMAKE_LFLAGS_SHLIB= -dynamiclib
 QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace
-        QMAKE_LFLAGS_PLUGIN= -bundle
-        QMAKE_LFLAGS_SONAME= -install_name$${LITERAL_WHITESPACE}@executable_path/../Frameworks/
+        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
+        #QMAKE_LFLAGS_SONAME= -install_name$${LITERAL_WHITESPACE}@executable_path/../Frameworks/
         QMAKE_LFLAGS_THREAD=
         QMAKE_RPATH     =
 
@@ -77,3 +77,5 @@ QMAKE_COPY_DIR		= $$QMAKE_COPY -r
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf
index 6df9f06..df4e707 100644
--- a/mkspecs/netbsd-g++/qmake.conf
+++ b/mkspecs/netbsd-g++/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
@@ -78,3 +78,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf
index 8f2dbf4..fdbbf55 100644
--- a/mkspecs/openbsd-g++/qmake.conf
+++ b/mkspecs/openbsd-g++/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
@@ -79,3 +79,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/pyfix.py b/mkspecs/pyfix.py
new file mode 100644
index 0000000..7b86f42
--- a/dev/null
+++ b/mkspecs/pyfix.py
@@ -0,0 +1,82 @@
+import os
+
+# patch the following
+# QMAKE_CFLAGS add $(CFLAGS_EXTRA)
+# QMAKE_CXXFLAGS add $(CXXFLAGS_EXTRA)
+# QMAKE_LFLAGS add $(LFLAGS_EXTRA)
+# QMAKE_LIBS add $(LIBS_EXTRA)
+
+# QMAKE_CFLAGS_RELEASE include old argument
+# 
+
+add_map = { "QMAKE_CFLAGS"   : "$(CFLAGS_EXTRA)",
+            "QMAKE_CXXFLAGS" : "$(CXXFLAGS_EXTRA)",
+            "QMAKE_LFLAGS"   : "$(LFLAGS_EXTRA)",
+            "QMAKE_LIBS"     : "$(LIBS_EXTRA)" }
+            
+rep_map = { "QMAKE_CFLAGS_RELEASE" : ["$(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE),", ")"] }
+
+
+def split_text(line):
+ """
+ SPlits the text in the form of "key = value"
+ and returns a two tuple-tuple
+ """
+ ## disabled strip and split tab stuff
+ left = line.find('=')
+ if left == -1:
+    raise Exception, "No src line"
+ key = line[0:left].strip()
+ val = line[left+1:].strip()
+ return (key,val)
+
+def apply_line(line):
+ """
+ Apply changes to a line. This will not handle the exception
+ thrown by split_text
+ """
+ key,val = split_text(line)
+
+ tabs = '\t'
+ if len(key) <= 14:
+         tabs = tabs + '\t'
+ spac = ''
+ if len(val) != 0:
+         spac = ' '
+
+ # for minimal changes on the file we've three returns
+ if add_map.has_key(key):
+    val = val + spac + add_map[key]
+    return key + tabs + '= ' + val + '\n'
+ elif rep_map.has_key(key):
+    val = rep_map[key][0] + ' ' + val + rep_map[key][1]
+    return key + tabs + '= ' + val + '\n'
+ return line
+
+
+
+def apply_on_file(fi):
+  """
+  Apply the maps on files
+  """
+  lines = []
+  for line in file(fi):    
+     try:
+             line = apply_line(line)
+     except:
+        pass
+     lines.append(line)
+
+  f = file(fi,'w')
+  for line in lines:
+      f.write(line) 
+
+def fix_it():
+  for root, dirs, files in os.walk('./mkspecs'):
+     for fil in files:
+         print root + '/' + fil
+         apply_on_file(root+'/'+fil)
+
+
+if __name__ == '__main__':
+            fix_it()
diff --git a/mkspecs/qnx-g++/qmake.conf b/mkspecs/qnx-g++/qmake.conf
index adca607..4b71b75 100644
--- a/mkspecs/qnx-g++/qmake.conf
+++ b/mkspecs/qnx-g++/qmake.conf
@@ -3,12 +3,12 @@
 #
 # qmake configuration for qnx-g++
 #
-# QNX RTOS v6 with X11
+# Written for QNX RTOS v6 with X11.
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
@@ -56,7 +56,7 @@ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
         QMAKE_LFLAGS_THREAD=
         QMAKE_RPATH     = -Wl,-rpath,
 
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = -lunix $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldl
         QMAKE_LIBS_X11  = -lXext -lX11 -lm
         QMAKE_LIBS_X11SM= -lSM -lICE
@@ -79,3 +79,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/qws/freebsd-generic-g++/qmake.conf b/mkspecs/qws/freebsd-generic-g++/qmake.conf
index 82b22d7..0a9ea90 100644
--- a/mkspecs/qws/freebsd-generic-g++/qmake.conf
+++ b/mkspecs/qws/freebsd-generic-g++/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt link_prl
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
@@ -39,6 +39,8 @@ QMAKE_INCDIR		= /usr/local/include
         QMAKE_LIBDIR    = /usr/local/lib
         QMAKE_INCDIR_QT         = $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
+        QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
+        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
 
         QMAKE_LINK      = g++
         QMAKE_LINK_SHLIB= g++
@@ -55,6 +57,7 @@ QMAKE_LIBS		= $(LIBS_EXTRA)
         QMAKE_LIBS_QT   = -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
 QMAKE_LIBS_THREAD       = 
+        QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
@@ -69,3 +72,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h b/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
new file mode 100644
index 0000000..a164a73
--- a/dev/null
+++ b/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
@@ -0,0 +1,103 @@
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+#include <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+
+#ifdef QT_THREAD_SUPPORT
+#include <pthread.h>
+#endif
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#include <dlfcn.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+// DNS header files are not fully covered by X/Open specifications.
+// In particular nothing is said about res_* :/
+// On BSDs header files <netinet/in.h> and <arpa/nameser.h> are not
+// included by <resolv.h>. Note that <arpa/nameser.h> must be included
+// before <resolv.h>.
+#include <netinet/in.h>
+#define class c_class // FreeeBSD 3.x
+#include <arpa/nameser.h>
+#undef class
+#include <resolv.h>
+
+
+#if !defined(QT_NO_COMPAT)
+        #define QT_STATBUF      struct stat
+        #define QT_STATBUF4TSTATstruct stat
+        #define QT_STAT                 ::stat
+        #define QT_FSTAT        ::fstat
+        #define QT_STAT_REG     S_IFREG
+        #define QT_STAT_DIR     S_IFDIR
+        #define QT_STAT_MASK    S_IFMT
+        #define QT_STAT_LNK     S_IFLNK
+        #define QT_FILENO       fileno
+        #define QT_OPEN                 ::open
+        #define QT_CLOSE        ::close
+        #define QT_LSEEK        ::lseek
+        #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
+#endif
+
+        #define QT_SIGNAL_RETTYPEvoid
+        #define QT_SIGNAL_ARGS  int
+        #define QT_SIGNAL_IGNORESIG_IGN
+
+#if __FreeBSD_version < 400000
+// FreeBSD 1.0 - 3.5.1
+        #  define QT_SOCKLEN_T  int
+#else
+// FreeBSD 4.0 - 5.0
+        #  define QT_SOCKLEN_T  socklen_t
+#endif
+
+        #define QT_SNPRINTF     ::snprintf
+        #define QT_VSNPRINTF    ::vsnprintf
+
+// Older FreeBSD versions may still use the a.out format instead of ELF.
+// From the FreeBSD man pages:
+        // In previous implementations, it was necessary to prepend an
+        // underscore to all external symbols in order to gain symbol
+        // compatibility with object code compiled from the C language.
+        // This is still the case when using the (obsolete) -aout option to
+        // the C language compiler.
+#ifndef __ELF__
+#define QT_AOUT_UNDERSCORE
+#endif
+
+
+#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf
index a5c08ae..244f9a8 100644
--- a/mkspecs/qws/linux-arm-g++/qmake.conf
+++ b/mkspecs/qws/linux-arm-g++/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt link_prl
 
         QMAKE_CC        = arm-linux-gcc
         QMAKE_LEX       = flex
@@ -40,9 +40,11 @@ QMAKE_INCDIR_QT		= $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/X11R6/include
         QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
+        QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
+        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
 
-        QMAKE_LINK      = arm-linux-gcc
-        QMAKE_LINK_SHLIB= arm-linux-gcc
+        QMAKE_LINK      = arm-linux-g++
+        QMAKE_LINK_SHLIB= arm-linux-g++
         QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
@@ -59,6 +61,7 @@ QMAKE_LIBS_X11SM	=
         QMAKE_LIBS_QT   = -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl
+        QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
 QMAKE_LIBS_THREAD       = -lpthread
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
@@ -74,3 +77,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf
index 2610b12..4e837d6 100644
--- a/mkspecs/qws/linux-generic-g++/qmake.conf
+++ b/mkspecs/qws/linux-generic-g++/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt link_prl
 
         QMAKE_CC        = $(CCACHE) $(DISTCC) gcc
         QMAKE_LEX       = flex
@@ -40,6 +40,8 @@ QMAKE_INCDIR_QT		= $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/X11R6/include
         QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
+        QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include/
+        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
 
         QMAKE_LINK      = g++
         QMAKE_LINK_SHLIB= g++
@@ -59,6 +61,7 @@ QMAKE_LIBS_X11SM	=
         QMAKE_LIBS_QT   = -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl
+        QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
 QMAKE_LIBS_THREAD       = -lpthread
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
@@ -74,3 +77,6 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+QMAKE_STRIP             = strip
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf
index be91a64..b42f2d6 100644
--- a/mkspecs/qws/linux-ipaq-g++/qmake.conf
+++ b/mkspecs/qws/linux-ipaq-g++/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt link_prl
 
         QMAKE_CC        = arm-linux-gcc
         QMAKE_LEX       = flex
@@ -40,9 +40,11 @@ QMAKE_INCDIR_QT		= $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/X11R6/include
         QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
+        QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
+        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
 
-        QMAKE_LINK      = arm-linux-gcc
-        QMAKE_LINK_SHLIB= arm-linux-gcc
+        QMAKE_LINK      = arm-linux-g++
+        QMAKE_LINK_SHLIB= arm-linux-g++
         QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
@@ -50,7 +52,7 @@ QMAKE_LFLAGS_SHLIB      = -shared
 QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME     = -Wl,-soname,
 QMAKE_LFLAGS_THREAD     =
-QMAKE_RPATH             = -Wl,-rpath-link,
+QMAKE_RPATH             = -Wl,-rpath,
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
 QMAKE_LIBS_DYNLOAD      = -ldl
@@ -59,6 +61,7 @@ QMAKE_LIBS_X11SM	=
         QMAKE_LIBS_QT   = -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl
+        QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
 QMAKE_LIBS_THREAD       = -lpthread
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
@@ -74,3 +77,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/qws/linux-mips-g++/qmake.conf b/mkspecs/qws/linux-mips-g++/qmake.conf
index f5d2033..f9a410a 100644
--- a/mkspecs/qws/linux-mips-g++/qmake.conf
+++ b/mkspecs/qws/linux-mips-g++/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt link_prl
 
         QMAKE_CC        = mipsel-linux-gcc
         QMAKE_LEX       = flex
@@ -40,6 +40,8 @@ QMAKE_INCDIR_QT		= $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/X11R6/include
         QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
+        QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
+        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
 
         QMAKE_LINK      = mipsel-linux-g++
         QMAKE_LINK_SHLIB= mipsel-linux-g++
@@ -59,6 +61,7 @@ QMAKE_LIBS_X11SM	=
         QMAKE_LIBS_QT   = -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl
+        QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
 QMAKE_LIBS_THREAD       = -lpthread
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
@@ -74,3 +77,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/qws/linux-ramses-g++/qmake.conf b/mkspecs/qws/linux-ramses-g++/qmake.conf
index 612c7a4..028c157 100644
--- a/mkspecs/qws/linux-ramses-g++/qmake.conf
+++ b/mkspecs/qws/linux-ramses-g++/qmake.conf
@@ -20,7 +20,7 @@ QMAKE_LEX		= flex
         QMAKE_LEXFLAGS  =
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    = -I$$STAGING_INC -pipe $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS    = -I$$STAGING_INC -pipe $(CFLAGS_EXTRA) 
         QMAKE_CFLAGS_WARN_ON= -Wall -W
         QMAKE_CFLAGS_WARN_OFF=
         QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
@@ -50,7 +50,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
         QMAKE_LINK      = arm-linux-gcc
         QMAKE_LINK_SHLIB= arm-linux-gcc
-        QMAKE_LFLAGS    = -L$$STAGING_LIB -Wl,-rpath,$$STAGING_LIB -Wl,-rpath-link,$$STAGING_LIB -lpng -ljpeg -lz $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS    = -L$$STAGING_LIB -Wl,-rpath,$$STAGING_LIB -Wl,-rpath-link,$$STAGING_LIB -lpng -ljpeg -lz $(LFLAGS_EXTRA) 
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
 QMAKE_LFLAGS_SHLIB      = -shared
@@ -59,7 +59,7 @@ QMAKE_LFLAGS_SONAME     = -Wl,-soname,
 QMAKE_LFLAGS_THREAD     =
 QMAKE_RPATH             = -Wl,-rpath,
 
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = $(LIBS_EXTRA) 
 QMAKE_LIBS_DYNLOAD      = -ldl
         QMAKE_LIBS_X11  = 
         QMAKE_LIBS_X11SM= 
@@ -81,3 +81,6 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+QMAKE_STRIP             = strip
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/qws/linux-sharp-g++/qmake.conf b/mkspecs/qws/linux-sharp-g++/qmake.conf
index e90ea59..27b2e91 100644
--- a/mkspecs/qws/linux-sharp-g++/qmake.conf
+++ b/mkspecs/qws/linux-sharp-g++/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt link_prl
 
         QMAKE_CC        = arm-linux-gcc
         QMAKE_LEX       = flex
@@ -22,7 +22,7 @@ QMAKE_CFLAGS_SHLIB	= -fPIC
         QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
         QMAKE_CFLAGS_THREAD= -D_REENTRANT
 
-        QMAKE_CXX       = arm-linux-g++ -DQT_QWS_SL5XXX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM
+        QMAKE_CXX       = arm-linux-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP 
         QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS  -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
@@ -40,9 +40,11 @@ QMAKE_INCDIR_QT		= $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/X11R6/include
         QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
+        QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
+        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
 
-        QMAKE_LINK      = arm-linux-gcc
-        QMAKE_LINK_SHLIB= arm-linux-gcc
+        QMAKE_LINK      = arm-linux-g++
+        QMAKE_LINK_SHLIB= arm-linux-g++
         QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
@@ -59,6 +61,7 @@ QMAKE_LIBS_X11SM	=
         QMAKE_LIBS_QT   = -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl
+        QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
 QMAKE_LIBS_THREAD       = -lpthread
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
@@ -74,3 +77,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/qws/linux-simpad-g++/qmake.conf b/mkspecs/qws/linux-simpad-g++/qmake.conf
index 7dce65d..9094ea9 100644
--- a/mkspecs/qws/linux-simpad-g++/qmake.conf
+++ b/mkspecs/qws/linux-simpad-g++/qmake.conf
@@ -13,7 +13,7 @@ QMAKE_LEX		= flex
         QMAKE_LEXFLAGS  =
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA) 
         QMAKE_CFLAGS_WARN_ON= -Wall -W
         QMAKE_CFLAGS_WARN_OFF=
         QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
@@ -23,7 +23,7 @@ QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
         QMAKE_CFLAGS_THREAD= -D_REENTRANT
 
         QMAKE_CXX       = $(CCACHE) arm-linux-g++
-        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) 
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
         QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
@@ -43,7 +43,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
         QMAKE_LINK      = arm-linux-gcc
         QMAKE_LINK_SHLIB= arm-linux-gcc
-        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS    = $(LFLAGS_EXTRA) 
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
 QMAKE_LFLAGS_SHLIB      = -shared
@@ -52,7 +52,7 @@ QMAKE_LFLAGS_SONAME     = -Wl,-soname,
 QMAKE_LFLAGS_THREAD     =
 QMAKE_RPATH             = -Wl,-rpath,
 
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = $(LIBS_EXTRA) 
 QMAKE_LIBS_DYNLOAD      = -ldl
         QMAKE_LIBS_X11  = 
         QMAKE_LIBS_X11SM= 
@@ -74,3 +74,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/qws/linux-x86-g++/qmake.conf b/mkspecs/qws/linux-x86-g++/qmake.conf
index fc5723a..7c31e2c 100644
--- a/mkspecs/qws/linux-x86-g++/qmake.conf
+++ b/mkspecs/qws/linux-x86-g++/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt link_prl
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
@@ -40,6 +40,8 @@ QMAKE_INCDIR_QT		= $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/X11R6/include
         QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
+        QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
+        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
 
         QMAKE_LINK      = g++
         QMAKE_LINK_SHLIB= g++
@@ -59,6 +61,7 @@ QMAKE_LIBS_X11SM	=
         QMAKE_LIBS_QT   = -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl
+        QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
 QMAKE_LIBS_THREAD       = -lpthread
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
@@ -74,3 +77,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/qws/linux-yopy-g++/qmake.conf b/mkspecs/qws/linux-yopy-g++/qmake.conf
index 6d97110..3c8c148 100755
--- a/mkspecs/qws/linux-yopy-g++/qmake.conf
+++ b/mkspecs/qws/linux-yopy-g++/qmake.conf
@@ -13,7 +13,7 @@ QMAKE_LEX		= flex
         QMAKE_LEXFLAGS  =
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA) 
         QMAKE_CFLAGS_WARN_ON= -Wall -W
         QMAKE_CFLAGS_WARN_OFF=
         QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
@@ -74,3 +74,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+QMAKE_CHK_DIR_EXISTS    = test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf
index 7bc67c7..99acca7 100644
--- a/mkspecs/qws/macx-generic-g++/qmake.conf
+++ b/mkspecs/qws/macx-generic-g++/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt link_prl
         QMAKE_EXTENSION_SHLIB= dylib
 
         QMAKE_CC        = $(TB)cc
@@ -24,7 +24,8 @@ QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
         QMAKE_CFLAGS_THREAD= -D_REENTRANT
 
         QMAKE_CXX       = $(TB)c++
-        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) -DQ_OS_MACX -DQT_NO_SOUND -DOPIE_NO_OVERRIDE_QT -DOPIE_NO_BACKTRACE
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
+DEFINES                += QWS
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
         QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
@@ -41,6 +42,8 @@ QMAKE_INCDIR_QT		= $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/X11R6/include
         QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
+        QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
+        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
 
         QMAKE_LINK      = $$QMAKE_CXX
         QMAKE_LINK_SHLIB= $$QMAKE_CXX
@@ -58,9 +61,9 @@ QMAKE_LIBS		= $(LIBS_EXTRA)
         QMAKE_LIBS_X11  =
         QMAKE_LIBS_X11SM=
         QMAKE_LIBS_QT   = -lqte
-        #QMAKE_LIBS_QT  = libqte.dylib
         QMAKE_LIBS_QT_THREAD= -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl
+        QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
         QMAKE_LIBS_THREAD= 
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
@@ -76,6 +79,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
-
-
-
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/qws/qnx4-cc/qmake.conf b/mkspecs/qws/qnx4-cc/qmake.conf
index 1ca2029..fac6a5b 100644
--- a/mkspecs/qws/qnx4-cc/qmake.conf
+++ b/mkspecs/qws/qnx4-cc/qmake.conf
@@ -6,7 +6,7 @@
  
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release no_mocdepend
+        CONFIG          += qt no_mocdepend link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
@@ -16,14 +16,14 @@ QMAKE_YACCFLAGS		= -d
         QMAKE_CFLAGS    = -WC,-sg $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON    = -w1
 QMAKE_CFLAGS_WARN_OFF   = -w0
-QMAKE_CFLAGS_RELEASE    = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
         QMAKE_CFLAGS_DEBUG= -g2d
         QMAKE_CFLAGS_SHLIB= 
         QMAKE_CFLAGS_YACC= 
         QMAKE_CFLAGS_THREAD= -D_REENTRANT -WC,-bm
 
         QMAKE_CXX       = cc
-        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -DQWS  $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -DQWS $(CXXFLAGS_EXTRA)
         DEFINES                 += QT_NO_SOUND QT_CLEAN_NAMESPACE QT_NO_QWS_TRANSFORMED QT_NO_QWS_MOUSE_AUTO QT_NO_QWS_MOUSE_MANUAL QT_NO_QWS_LINUXFB
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
@@ -37,10 +37,12 @@ QMAKE_INCDIR		= /usr/local/include /usr/include/graphics
         QMAKE_LIBDIR    = /usr/local/lib $(QTDIR)/lib
         QMAKE_INCDIR_QT         = $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
+        QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
+        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
 
         QMAKE_LINK      = cc
         QMAKE_LINK_SHLIB= cc
-        QMAKE_LFLAGS    = -lsocket  $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS    = -lsocket $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG= -g2d
         QMAKE_LFLAGS_SHLIB= -d
@@ -49,10 +51,11 @@ QMAKE_LFLAGS_SONAME	=
         QMAKE_LFLAGS_THREAD=
         QMAKE_RPATH     = 
 
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = -lsocket $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD=
         QMAKE_LIBS_QT   = -T 1 -lqte 
         QMAKE_LIBS_QT_THREAD= -lqte-mt
+        QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
         QMAKE_LIBS_THREAD= 
 
         QMAKE_MOC       = $(QTDIR)/util/scripts/qnx4moc.sh $(CXXFLAGS) $(INCPATH)
@@ -68,3 +71,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/qws/qnx6-generic-cc/qmake.conf b/mkspecs/qws/qnx6-generic-cc/qmake.conf
index 51eb3fe..55535fd 100644
--- a/mkspecs/qws/qnx6-generic-cc/qmake.conf
+++ b/mkspecs/qws/qnx6-generic-cc/qmake.conf
@@ -6,7 +6,7 @@
  
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt link_prl
  
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
@@ -40,10 +40,12 @@ QMAKE_INCDIR_QT		= $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/X11R6/include
         QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
+        QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
+        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
  
         QMAKE_LINK      = cc
         QMAKE_LINK_SHLIB= cc
-        QMAKE_LFLAGS    = -lsocket -ldisputil  $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS    = -lsocket -ldisputil $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
         QMAKE_LFLAGS_SHLIB= -shared
@@ -52,13 +54,14 @@ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
         QMAKE_LFLAGS_THREAD=
         QMAKE_RPATH     = -Wl,-rpath,
  
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = -lsocket -lcpp $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD=
         QMAKE_LIBS_X11  = -ldisputil -lm
         QMAKE_LIBS_X11SM=
         QMAKE_LIBS_QT   = -lqte 
         QMAKE_LIBS_QT_THREAD= -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl
+        QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
         QMAKE_LIBS_THREAD= -lpthread
  
         QMAKE_MOC       = $(QTDIR)/bin/moc
@@ -74,4 +77,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
-
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/qws/qnx6-generic-g++/qmake.conf b/mkspecs/qws/qnx6-generic-g++/qmake.conf
index 3519a59..93f0dfc 100644
--- a/mkspecs/qws/qnx6-generic-g++/qmake.conf
+++ b/mkspecs/qws/qnx6-generic-g++/qmake.conf
@@ -6,7 +6,7 @@
  
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt link_prl
  
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
@@ -40,10 +40,12 @@ QMAKE_INCDIR_QT		= $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/X11R6/include
         QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
+        QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
+        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
  
         QMAKE_LINK      = cc -fhonor-std
         QMAKE_LINK_SHLIB= cc -fhonor-std
-        QMAKE_LFLAGS    = -lsocket -ldisputil  $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS    = -lsocket -ldisputil $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
         QMAKE_LFLAGS_SHLIB= -shared
@@ -52,13 +54,14 @@ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
         QMAKE_LFLAGS_THREAD=
         QMAKE_RPATH     = -Wl,-rpath,
  
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = -lsocket $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD=
         QMAKE_LIBS_X11  = -ldisputil -lm
         QMAKE_LIBS_X11SM=
         QMAKE_LIBS_QT   = -lqte 
         QMAKE_LIBS_QT_THREAD= -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl
+        QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
         QMAKE_LIBS_THREAD= -lpthread
  
         QMAKE_MOC       = $(QTDIR)/bin/moc
@@ -74,4 +77,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
-
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/qws/solaris-generic-g++/qmake.conf b/mkspecs/qws/solaris-generic-g++/qmake.conf
index 057e343..a521389 100644
--- a/mkspecs/qws/solaris-generic-g++/qmake.conf
+++ b/mkspecs/qws/solaris-generic-g++/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt link_prl
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
@@ -40,6 +40,8 @@ QMAKE_INCDIR_QT		= $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/X11R6/include
         QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
+        QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
+        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
 
         QMAKE_LINK      = g++
         QMAKE_LINK_SHLIB= g++
@@ -52,13 +54,14 @@ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
         QMAKE_LFLAGS_THREAD=
         QMAKE_RPATH     = -Wl,-rpath,
 
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = -lsocket -lnsl -lresolv $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldl
         QMAKE_LIBS_X11  =
         QMAKE_LIBS_X11SM=
         QMAKE_LIBS_QT   = -lqte
         QMAKE_LIBS_QT_THREAD= -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl
+        QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
         QMAKE_LIBS_THREAD= -lthread -lrt
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
@@ -74,3 +77,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/qws/solaris-generic-g++/qplatformdefs.h b/mkspecs/qws/solaris-generic-g++/qplatformdefs.h
index a4ca615..02ab5b4 100644
--- a/mkspecs/qws/solaris-generic-g++/qplatformdefs.h
+++ b/mkspecs/qws/solaris-generic-g++/qplatformdefs.h
@@ -6,6 +6,9 @@
 #include "qglobal.h"
 
 // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#ifndef _POSIX_PTHREAD_SEMANTICS
+#define _POSIX_PTHREAD_SEMANTICS
+#endif
 
 #include <unistd.h>
 
@@ -77,13 +80,16 @@
         #define QT_SIGNAL_IGNORESIG_IGN
 
 #if !defined(_XOPEN_UNIX)
-// Function usleep() is in C library but not in header files on Solaris 2.5.1.
-// Not really a surprise, usleep() is specified by XPG4v2 and XPG4v2 is only
-// supported by Solaris 2.6 and better.
+// Function usleep() is defined in C library but not declared in header files
+// on Solaris 2.5.1. Not really a surprise, usleep() is specified by XPG4v2
+// and XPG4v2 is only supported by Solaris 2.6 and better.
+// Function gethostname() is defined in C library but not declared in <unistd.h>
+// on Solaris 2.5.1.
 // So we are trying to detect Solaris 2.5.1 using macro _XOPEN_UNIX which is
 // not defined by <unistd.h> when XPG4v2 is not supported.
 typedef unsigned int useconds_t;
 extern "C" int usleep(useconds_t);
+extern "C" int gethostname(char *, int);
 #endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) && (_XOPEN_VERSION-0 >= 500)
diff --git a/mkspecs/reliant-cds-64/qmake.conf b/mkspecs/reliant-cds-64/qmake.conf
index 8bd4fa1..d01099c 100644
--- a/mkspecs/reliant-cds-64/qmake.conf
+++ b/mkspecs/reliant-cds-64/qmake.conf
@@ -1,12 +1,14 @@
 #
 # $Id$
 #
-# tmake configuration for Reliant UNIX 5.45 using the CDS++ C/C++ compiler V2.0C
+# qmake configuration for reliant-cds-64
+#
+# Written for Reliant UNIX 5.45 using the CDS++ C/C++ compiler V2.0C.
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
@@ -52,7 +54,7 @@ QMAKE_LFLAGS_SHLIB	= -G
         QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
         QMAKE_LFLAGS_THREAD= -K pthread
-        QMAKE_RPATH     = -Wl,-Brpath=,
+        QMAKE_RPATH     = -Wl,-Brpath=
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldl
@@ -79,3 +81,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/reliant-cds/qmake.conf b/mkspecs/reliant-cds/qmake.conf
index 539cee7..7e7dd96 100644
--- a/mkspecs/reliant-cds/qmake.conf
+++ b/mkspecs/reliant-cds/qmake.conf
@@ -1,12 +1,14 @@
 #
 # $Id$
 #
-# tmake configuration for Reliant UNIX 5.45 using the CDS++ C/C++ compiler V2.0C
+# qmake configuration for reliant-cds
+#
+# Written for Reliant UNIX 5.45 using the CDS++ C/C++ compiler V2.0C.
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
@@ -52,7 +54,7 @@ QMAKE_LFLAGS_SHLIB	= -G
         QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
         QMAKE_LFLAGS_THREAD= -K pthread
-        QMAKE_RPATH     = -Wl,-Brpath=,
+        QMAKE_RPATH     = -Wl,-Brpath=
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldl
@@ -79,3 +81,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf
index 4da6809..5d6c7dc 100644
--- a/mkspecs/sco-cc/qmake.conf
+++ b/mkspecs/sco-cc/qmake.conf
@@ -3,13 +3,15 @@
 #
 # qmake configuration for sco-cc
 #
+# Written for SCO OpenServer with UDK.
+#
 # -Wf,--diag_suppress,838
         # turns off warning about missing return types in X headers
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
@@ -23,7 +25,6 @@ QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB= -KPIC
         QMAKE_CFLAGS_YACC= -Wf,--diag_suppress,111 -Wf,--diag_suppress,177
-        QMAKE_CFLAGS_THREAD= -Kthread
 
         QMAKE_CXX       = CC
         QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 $(CXXFLAGS_EXTRA)
@@ -33,7 +34,6 @@ QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE -Tused
         QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
         QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
         QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
-        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
 
         QMAKE_INCDIR    =
         QMAKE_LIBDIR    =
@@ -52,24 +52,20 @@ QMAKE_LFLAGS_DEBUG	=
         QMAKE_LFLAGS_SHLIB= -G
         QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
-        QMAKE_LFLAGS_THREAD= -Kthread
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldl
         QMAKE_LIBS_X11  = -lXext -lX11 -lresolv -lsocket -lnsl -lm
         QMAKE_LIBS_X11SM= -lSM -lICE
         QMAKE_LIBS_QT   = -lqt
-        QMAKE_LIBS_QT_THREAD= -lqt-mt
 
-        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt -lSM -lICE
+        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt
         QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
 
-        QMAKE_LIBS_THREAD=
-
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
 
-        QMAKE_AR        = ar cqs
+        QMAKE_AR        = ar cq
         QMAKE_RANLIB    =
 
         QMAKE_TAR       = tar -cf
@@ -79,3 +75,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/sco-cc/qplatformdefs.h b/mkspecs/sco-cc/qplatformdefs.h
index 4201ed6..06af247 100644
--- a/mkspecs/sco-cc/qplatformdefs.h
+++ b/mkspecs/sco-cc/qplatformdefs.h
@@ -7,11 +7,6 @@
 
 // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
 
-// This is to have PATH_MAX defined in <limits.h>
-#ifndef _IBCS2
-#  define _IBCS2
-#endif
-
 #include <unistd.h>
 
 
@@ -31,6 +26,7 @@
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
+#include <sys/filio.h>
 #include <sys/ipc.h>
 #include <sys/time.h>
 #include <sys/shm.h>
@@ -80,7 +76,7 @@
         #define QT_SIGNAL_ARGS  int
         #define QT_SIGNAL_IGNORESIG_IGN
 
-        #define QT_SOCKLEN_T    int
+        #define QT_SOCKLEN_T    size_t
 
         #define QT_SNPRINTF     ::snprintf
         #define QT_VSNPRINTF    ::vsnprintf
diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf
index 5a9c11a..ae559d8 100644
--- a/mkspecs/sco-g++/qmake.conf
+++ b/mkspecs/sco-g++/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
@@ -21,7 +21,6 @@ QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB= -fPIC
         QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
-        QMAKE_CFLAGS_THREAD= -D_REENTRANT
 
         QMAKE_CXX       = g++
         QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
@@ -32,7 +31,6 @@ QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
         QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
         QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
         QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
-        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
 
         QMAKE_INCDIR    =
         QMAKE_LIBDIR    =
@@ -74,3 +72,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/sco-g++/qplatformdefs.h b/mkspecs/sco-g++/qplatformdefs.h
index 0fc27cb..34c87e4 100644
--- a/mkspecs/sco-g++/qplatformdefs.h
+++ b/mkspecs/sco-g++/qplatformdefs.h
@@ -87,5 +87,9 @@
         #define QT_SNPRINTF     ::snprintf
         #define QT_VSNPRINTF    ::vsnprintf
 
+// SCO OpenServer redefines raise -> kill
+#if defined(raise)
+# undef raise
+#endif
 
 #endif // QPLATFORMDEFS_H
diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf
index 0da6a2d..45b5e4a 100644
--- a/mkspecs/solaris-cc-64/qmake.conf
+++ b/mkspecs/solaris-cc-64/qmake.conf
@@ -1,8 +1,9 @@
 #
 # $Id$
 #
-# qmake configuration for Sun WorkShop 5.0, Forte Developer 6,
-        #                               and Sun ONE Studio 7 on Solaris
+# qmake configuration for solaris-cc-64
+#
+# Written for Sun WorkShop 5.0, Forte Developer 6, and Sun ONE Studio 7.
 #
 # From the standards(5) manual page:
         # The XNS4 specification is safe for use only in ILP32 (32-bit)
@@ -24,11 +25,11 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
-        QMAKE_LEXFLAGS  = 
+        QMAKE_LEXFLAGS  =
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = -xarch=v9 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ $(CFLAGS_EXTRA)
@@ -81,7 +82,7 @@ QMAKE_LIBS_QT		= -lqt
         QMAKE_LIBS_QT_THREAD= -lqt-mt
         QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
         QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
-        QMAKE_LIBS_THREAD= -lpthread
+        QMAKE_LIBS_THREAD= -lpthread -lrt
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
@@ -98,3 +99,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf
index bee60c9..d1f080e 100644
--- a/mkspecs/solaris-cc/qmake.conf
+++ b/mkspecs/solaris-cc/qmake.conf
@@ -1,17 +1,18 @@
 #
 # $Id$
 #
-# qmake configuration for Sun WorkShop 5.0, Forte Developer 6,
-        #                               and Sun ONE Studio 7 on Solaris
+# qmake configuration for solaris-cc
+#
+# Written for Sun WorkShop 5.0, Forte Developer 6, and Sun ONE Studio 7.
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
-        QMAKE_LEXFLAGS  = 
+        QMAKE_LEXFLAGS  =
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = $(CFLAGS_EXTRA)
@@ -64,7 +65,7 @@ QMAKE_LIBS_QT		= -lqt
         QMAKE_LIBS_QT_THREAD= -lqt-mt
         QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
         QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
-        QMAKE_LIBS_THREAD= -lpthread
+        QMAKE_LIBS_THREAD= -lpthread -lrt
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
@@ -81,3 +82,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/solaris-cc/qplatformdefs.h b/mkspecs/solaris-cc/qplatformdefs.h
index f9480a9..9506b3c 100644
--- a/mkspecs/solaris-cc/qplatformdefs.h
+++ b/mkspecs/solaris-cc/qplatformdefs.h
@@ -6,6 +6,7 @@
 #include "qglobal.h"
 
 // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#define _POSIX_PTHREAD_SEMANTICS
 
 #include <unistd.h>
 
@@ -77,13 +78,16 @@
         #define QT_SIGNAL_IGNORESIG_IGN
 
 #if !defined(_XOPEN_UNIX)
-// Function usleep() is in C library but not in header files on Solaris 2.5.1.
-// Not really a surprise, usleep() is specified by XPG4v2 and XPG4v2 is only
-// supported by Solaris 2.6 and better.
+// Function usleep() is defined in C library but not declared in header files
+// on Solaris 2.5.1. Not really a surprise, usleep() is specified by XPG4v2
+// and XPG4v2 is only supported by Solaris 2.6 and better.
+// Function gethostname() is defined in C library but not declared in <unistd.h>
+// on Solaris 2.5.1.
 // So we are trying to detect Solaris 2.5.1 using macro _XOPEN_UNIX which is
 // not defined by <unistd.h> when XPG4v2 is not supported.
 typedef unsigned int useconds_t;
 extern "C" int usleep(useconds_t);
+extern "C" int gethostname(char *, int);
 #endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) && (_XOPEN_VERSION-0 >= 500)
diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf
index 929de3e..e6760f8 100644
--- a/mkspecs/solaris-g++-64/qmake.conf
+++ b/mkspecs/solaris-g++-64/qmake.conf
@@ -8,7 +8,7 @@
 # or non-patched systems -fpermissive works around the incompatibility
 # between GCC 2.95 or better and Solaris - but we still get warnings
 # because we don't use -isystem.
-# 
+#
 # From the standards(5) manual page:
         # The XNS4 specification is safe for use only in ILP32 (32-bit)
         # environments and should not be used for LP64 (64-bit)
@@ -29,11 +29,11 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
-        QMAKE_LEXFLAGS  = 
+        QMAKE_LEXFLAGS  =
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = -m64 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ $(CFLAGS_EXTRA)
@@ -60,11 +60,11 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
         QMAKE_INCDIR    =
         QMAKE_LIBDIR    =
         QMAKE_INCDIR_X11= /usr/openwin/include
-        QMAKE_LIBDIR_X11= /usr/openwin/lib
+        QMAKE_LIBDIR_X11= /usr/openwin/lib/sparcv9
         QMAKE_INCDIR_QT         = $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/openwin/include
-        QMAKE_LIBDIR_OPENGL= /usr/openwin/lib
+        QMAKE_LIBDIR_OPENGL= /usr/openwin/lib/sparcv9
 
         QMAKE_LINK      = g++
         QMAKE_LINK_SHLIB= g++
@@ -86,7 +86,7 @@ QMAKE_LIBS_QT		= -lqt
         QMAKE_LIBS_QT_THREAD= -lqt-mt
         QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
         QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
-        QMAKE_LIBS_THREAD= -lthread
+        QMAKE_LIBS_THREAD= -lpthread -lrt
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
@@ -101,3 +101,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/solaris-g++-64/qplatformdefs.h b/mkspecs/solaris-g++-64/qplatformdefs.h
index e8e43d9..8b2dd83 100644
--- a/mkspecs/solaris-g++-64/qplatformdefs.h
+++ b/mkspecs/solaris-g++-64/qplatformdefs.h
@@ -6,6 +6,9 @@
 #include "qglobal.h"
 
 // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#ifndef _POSIX_PTHREAD_SEMANTICS
+#define _POSIX_PTHREAD_SEMANTICS
+#endif
 
 #include <unistd.h>
 
@@ -14,7 +17,7 @@
 
 
 #ifdef QT_THREAD_SUPPORT
-#include <thread.h>
+#include <pthread.h>
 #endif
 
 #include <dirent.h>
@@ -22,6 +25,7 @@
 #include <grp.h>
 #include <pwd.h>
 #include <signal.h>
+#include <dlfcn.h>
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -43,6 +47,7 @@
 #include <resolv.h>
 
 
+#if !defined(QT_NO_COMPAT)
         #define QT_STATBUF      struct stat
         #define QT_STATBUF4TSTATstruct stat
         #define QT_STAT                 ::stat
@@ -68,6 +73,7 @@
         #define QT_OPEN_CREAT   O_CREAT
         #define QT_OPEN_TRUNC   O_TRUNC
         #define QT_OPEN_APPEND  O_APPEND
+#endif
 
         #define QT_SIGNAL_RETTYPEvoid
         #define QT_SIGNAL_ARGS  int
diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf
index 21d658f..4035047 100644
--- a/mkspecs/solaris-g++/qmake.conf
+++ b/mkspecs/solaris-g++/qmake.conf
@@ -8,15 +8,15 @@
 # or non-patched systems -fpermissive works around the incompatibility
 # between GCC 2.95 or better and Solaris - but we still get warnings
 # because we don't use -isystem.
-# 
+#
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
-        QMAKE_LEXFLAGS  = 
+        QMAKE_LEXFLAGS  =
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = $(CFLAGS_EXTRA)
@@ -69,7 +69,7 @@ QMAKE_LIBS_QT		= -lqt
         QMAKE_LIBS_QT_THREAD= -lqt-mt
         QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
         QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
-        QMAKE_LIBS_THREAD= -lpthread
+        QMAKE_LIBS_THREAD= -lpthread -lrt
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
@@ -84,3 +84,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/solaris-g++/qplatformdefs.h b/mkspecs/solaris-g++/qplatformdefs.h
index a4ca615..02ab5b4 100644
--- a/mkspecs/solaris-g++/qplatformdefs.h
+++ b/mkspecs/solaris-g++/qplatformdefs.h
@@ -6,6 +6,9 @@
 #include "qglobal.h"
 
 // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#ifndef _POSIX_PTHREAD_SEMANTICS
+#define _POSIX_PTHREAD_SEMANTICS
+#endif
 
 #include <unistd.h>
 
@@ -77,13 +80,16 @@
         #define QT_SIGNAL_IGNORESIG_IGN
 
 #if !defined(_XOPEN_UNIX)
-// Function usleep() is in C library but not in header files on Solaris 2.5.1.
-// Not really a surprise, usleep() is specified by XPG4v2 and XPG4v2 is only
-// supported by Solaris 2.6 and better.
+// Function usleep() is defined in C library but not declared in header files
+// on Solaris 2.5.1. Not really a surprise, usleep() is specified by XPG4v2
+// and XPG4v2 is only supported by Solaris 2.6 and better.
+// Function gethostname() is defined in C library but not declared in <unistd.h>
+// on Solaris 2.5.1.
 // So we are trying to detect Solaris 2.5.1 using macro _XOPEN_UNIX which is
 // not defined by <unistd.h> when XPG4v2 is not supported.
 typedef unsigned int useconds_t;
 extern "C" int usleep(useconds_t);
+extern "C" int gethostname(char *, int);
 #endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) && (_XOPEN_VERSION-0 >= 500)
diff --git a/mkspecs/solaris-kcc/qmake.conf b/mkspecs/solaris-kcc/qmake.conf
index e2a523d..231b270 100644
--- a/mkspecs/solaris-kcc/qmake.conf
+++ b/mkspecs/solaris-kcc/qmake.conf
@@ -24,18 +24,18 @@ QMAKE_LEX		= flex
         QMAKE_LEXFLAGS  = 
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    = --c --display_error_number $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS    = --c --display_error_number $(CFLAGS_EXTRA) $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_DEPS= -M
         QMAKE_CFLAGS_WARN_ON=
         QMAKE_CFLAGS_WARN_OFF= -w
-        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), +K2)
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), +K2))
         QMAKE_CFLAGS_DEBUG= +K0
         QMAKE_CFLAGS_SHLIB= -KPIC
         QMAKE_CFLAGS_YACC= --diag_suppress 111,177
         QMAKE_CFLAGS_THREAD= -mt
 
         QMAKE_CXX       = KCC
-        QMAKE_CXXFLAGS  = --display_error_number --diag_suppress 611,1142 $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS  = --display_error_number --diag_suppress 611,1142 $(CXXFLAGS_EXTRA) $(CXXFLAGS_EXTRA)
         QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
@@ -56,7 +56,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/openwin/lib
 
         QMAKE_LINK      = KCC
         QMAKE_LINK_SHLIB= KCC
-        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS    = $(LFLAGS_EXTRA) $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
         QMAKE_LFLAGS_SHLIB=
@@ -65,7 +65,7 @@ QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
         QMAKE_LFLAGS_THREAD= -mt
         QMAKE_RPATH     = -R$$LITERAL_WHITESPACE
 
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = $(LIBS_EXTRA) $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldl
         QMAKE_LIBS_X11  = -lXext -lX11 -lresolv -lsocket -lnsl
         QMAKE_LIBS_X11SM= -lSM -lICE
diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf
index 2a1163a..6e45e8b 100644
--- a/mkspecs/tru64-cxx/qmake.conf
+++ b/mkspecs/tru64-cxx/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl plugin_no_soname
 
         QMAKE_CC        = cxx
         QMAKE_LEX       = flex
@@ -54,15 +54,15 @@ QMAKE_LFLAGS_THREAD	= -pthread
         QMAKE_LFLAGS_SONAME= -soname$$LITERAL_WHITESPACE
 QMAKE_RPATH             = -rpath$$LITERAL_WHITESPACE
 
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = -lm $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD=
-        QMAKE_LIBS_X11  = -lXext -lX11 -lm
+        QMAKE_LIBS_X11  = -lXext -lX11
         QMAKE_LIBS_X11SM= -lSM -lICE
         QMAKE_LIBS_QT   = -lqt
         QMAKE_LIBS_QT_THREAD= -lqt-mt
         QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
         QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
-        QMAKE_LIBS_THREAD= 
+        QMAKE_LIBS_THREAD= -lrt
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
@@ -77,3 +77,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf
index 72b3d58..12447e0 100644
--- a/mkspecs/tru64-g++/qmake.conf
+++ b/mkspecs/tru64-g++/qmake.conf
@@ -6,7 +6,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl plugin_no_soname
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
@@ -62,7 +62,7 @@ QMAKE_LIBS_QT		= -lqt
         QMAKE_LIBS_QT_THREAD= -lqt-mt
         QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
         QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
-        QMAKE_LIBS_THREAD= -lpthread -lexc
+        QMAKE_LIBS_THREAD= -lpthread -lexc -lrt
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
@@ -77,3 +77,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/ultrix-g++/qmake.conf b/mkspecs/ultrix-g++/qmake.conf
index d8754c0..01434b4 100644
--- a/mkspecs/ultrix-g++/qmake.conf
+++ b/mkspecs/ultrix-g++/qmake.conf
@@ -13,17 +13,17 @@ QMAKE_LEX		= flex
         QMAKE_LEXFLAGS  = 
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    = $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS    = $(CFLAGS_EXTRA) $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_DEPS= -M
         QMAKE_CFLAGS_WARN_ON= -Wall -W
         QMAKE_CFLAGS_WARN_OFF= -w
-        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2))
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB=
         QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
 
         QMAKE_CXX       = g++
-        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) $(CXXFLAGS_EXTRA)
         QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
@@ -43,14 +43,14 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
         QMAKE_LINK      = g++
         #QMAKE_LINK_SHLIB= g++
-        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS    = $(LFLAGS_EXTRA) $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
         #QMAKE_LFLAGS_SHLIB= -shared
         #QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         #QMAKE_LFLAGS_SONAME= -Wl,-soname,
 
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = $(LIBS_EXTRA) $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldl
         QMAKE_LIBS_X11  = -lXext -lX11 -lm
         QMAKE_LIBS_QT   = -lqt
diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf
index 5efb1a9..a6f1288 100644
--- a/mkspecs/unixware-cc/qmake.conf
+++ b/mkspecs/unixware-cc/qmake.conf
@@ -1,7 +1,9 @@
 #
 # $Id$
 #
-# qmake configuration for UnixWare 7 or Open UNIX 8 with UDK or OUDK
+# qmake configuration for unixware-cc
+#
+# Written for UnixWare 7 or Open UNIX 8 with UDK or OUDK.
 #
 # -Wf,--diag_suppress,838
         # turns off warning about missing return types in X headers
@@ -9,7 +11,7 @@
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
@@ -53,6 +55,7 @@ QMAKE_LFLAGS_SHLIB	= -G
         QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
         QMAKE_LFLAGS_THREAD= -Kthread
+        QMAKE_RPATH     = -R
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldl
@@ -61,7 +64,7 @@ QMAKE_LIBS_X11SM	= -lSM -lICE
         QMAKE_LIBS_QT   = -lqt
         QMAKE_LIBS_QT_THREAD= -lqt-mt
 
-        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt -lSM -lICE
+        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt
         QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
 
         QMAKE_LIBS_THREAD=
@@ -79,3 +82,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf
index 0298eef..45a351c 100644
--- a/mkspecs/unixware-g++/qmake.conf
+++ b/mkspecs/unixware-g++/qmake.conf
@@ -1,12 +1,14 @@
 #
 # $Id$
 #
-# qmake configuration for UnixWare 7 or Open UNIX 8 with OSTK
+# qmake configuration for unixware-g++
+#
+# Written for UnixWare 7 or Open UNIX 8 with OSTK.
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
@@ -52,6 +54,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
         QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME=
         QMAKE_LFLAGS_THREAD=
+        QMAKE_RPATH     = -Wl,-R,
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
         QMAKE_LIBS_DYNLOAD= -ldl
@@ -59,10 +62,8 @@ QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl -lm
         QMAKE_LIBS_X11SM= -lSM -lICE
         QMAKE_LIBS_QT   = -lqt
         QMAKE_LIBS_QT_THREAD= -lqt-mt
-
-        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt -lSM -lICE
+        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt
         QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
-
         QMAKE_LIBS_THREAD= -lthread
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
@@ -78,3 +79,5 @@ QMAKE_COPY		= cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
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,104 +28,118 @@
 #include <windows.h>
 
 #if __BORLANDC__ >= 0x550
-#ifdef QT_LARGE_FILE_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
+// 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_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_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_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
-        # 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_FILENO       _fileno
+        #define QT_OPEN                 ::open
+        #define QT_CLOSE        ::_close
+
+        #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
-        #else                                   // all other systems
-#ifdef QT_LARGE_FILE_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
+#endif
+
 #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
+// 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_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
+
+        #define QT_FILENO       fileno
+        #define QT_OPEN                 ::open
+        #define QT_CLOSE        ::close
+
+        #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
         #  define QT_GETCWD     ::_getcwd2
         #  define QT_CHDIR      ::_chdir2
-# else
+#else
         #  define QT_GETCWD     ::getcwd
         #  define QT_CHDIR      ::chdir
-# endif
-        # 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)
+#endif
+
+        #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_BINARYO_BINARY
-# endif
 #endif
 
+#endif // __BORLANDC__ >= 0x550
+
+// Borland Builder 5 and 6
+
         #define QT_SIGNAL_ARGS  int
 
         #define QT_VSNPRINTF    ::_vsnprintf
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 4bc603c..1347c44 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -1,25 +1,37 @@
 #
 # $Id$
 #
-# qmake configuration for Win32/g++ (Cygnus gnu-win32)
+# qmake configuration for win32-g++
+#
+# Written for MinGW
 #
 
-        MAKEFILE_GENERATOR= UNIX
+        MAKEFILE_GENERATOR= MINGW
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
+        DEFINES                 += UNICODE
+
+exists( $(QTDIR)\.qtwinconfig ) {
+        include( $(QTDIR)\.qtwinconfig )
+}
 
         QMAKE_CC        = gcc
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  = 
         QMAKE_YACC      = byacc
         QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    = -fvtable-thunks $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS    = $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_DEPS= -M
-        QMAKE_CFLAGS_WARN_ON=
-        QMAKE_CFLAGS_WARN_OFF=
-        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
+        QMAKE_CFLAGS_WARN_ON= -Wall 
+        QMAKE_CFLAGS_WARN_OFF= -w
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
+        QMAKE_CFLAGS_THREAD= -mthreads
+        QMAKE_CFLAGS_RTTI_ON= -frtti
+        QMAKE_CFLAGS_RTTI_OFF= -fno-rtti
+QMAKE_CFLAGS_EXCEPTIONS_ON = -fexceptions
+QMAKE_CFLAGS_EXCEPTIONS_OFF = -fno-exceptions
 
         QMAKE_CXX       = g++
         QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
@@ -29,9 +41,15 @@ QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
         QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
         QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
         QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
+        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
+        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_INCDIR_QT         = $(QTDIR)\include
+        QMAKE_LIBDIR_QT         = $(QTDIR)\lib
 
         QMAKE_RUN_CC    = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
         QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
@@ -39,32 +57,42 @@ QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
         QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
         QMAKE_LINK      = g++
-        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
-        QMAKE_LFLAGS_RELEASE=
+        QMAKE_LFLAGS    = -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS_RELEASE= -Wl,-s
         QMAKE_LFLAGS_DEBUG=
+        QMAKE_LFLAGS_THREAD= -mthreads
         QMAKE_LFLAGS_CONSOLE= -Wl,-subsystem,console
-        QMAKE_LFLAGS_WINDOWS= -Wl,-subsystem,windows
-QMAKE_LFLAGS_CONSOLE_DLL= -Wl,-subsystem,console
-QMAKE_LFLAGS_WINDOWS_DLL= -Wl,-subsystem,windows
+        QMAKE_LFLAGS_WINDOWS= -Wl,-subsystem,windows -e __Z19QtWinMainCRTStartupv
+QMAKE_LFLAGS_CONSOLE_DLL= -Wl,-subsystem,console -shared -Wl,--export-all-symbols
+QMAKE_LFLAGS_WINDOWS_DLL= -Wl,-subsystem,windows -shared -Wl,--export-all-symbols
+        QMAKE_LINK_OBJECT_MAX= 10
+QMAKE_LINK_OBJECT_SCRIPT= object_ld_script
+QMAKE_LINK_OBJMOC_SCRIPT= objmoc_ld_script
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
         QMAKE_LIBS_CONSOLE=
-        QMAKE_LIBS_WINDOWS= -luser32 -lgdi32 -lcomdlg32 -lwinmm -limm32 -lole32 -luuid -lwsock32
-        QMAKE_LIBS_QT   = -L$(QTDIR)/lib -lqt
+        QMAKE_LIBS_WINDOWS= -lkernel32 -luser32 -lgdi32 -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -limm32 -lwinmm -lwsock32 -lwinspool
+        QMAKE_LIBS_QT   = -lqt
+        QMAKE_LIBS_QT_THREAD= -lqt-mt
         QMAKE_LIBS_QT_ENTRY= -lqtmain
 
-        QMAKE_LIBS_OPENGL= -lopengl32
+        QMAKE_LIBS_OPENGL= -lopengl32 -lglu32
 
-        QMAKE_MOC       = $(QTDIR)/bin/moc.exe
-        QMAKE_UIC       = $(QTDIR)/bin/uic.exe
-        QMAKE_IDC       = $(QTDIR)/bin/idc.exe
+        QMAKE_MOC       = $(QTDIR)\bin\moc.exe
+        QMAKE_UIC       = $(QTDIR)\bin\uic.exe
+        QMAKE_IDC       = $(QTDIR)\bin\idc.exe
 
-        QMAKE_AR        = ar cqs
-        QMAKE_RANLIB    =
+        QMAKE_IDL       = midl
+        QMAKE_LIB       = ar -ru
+        QMAKE_RC        = windres
 
         QMAKE_ZIP       = zip -r -9
 
         QMAKE_COPY      = copy
         QMAKE_MOVE      = move
         QMAKE_DEL_FILE  = del
-        QMAKE_DEL_DIR   = deltree
+        QMAKE_DEL_DIR   = rmdir
+        QMAKE_STRIP     = strip
+        QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+        QMAKE_CHK_DIR_EXISTS= if not exist
+        QMAKE_MKDIR     = mkdir
diff --git a/mkspecs/win32-g++/qplatformdefs.h b/mkspecs/win32-g++/qplatformdefs.h
new file mode 100644
index 0000000..9f4d318
--- a/dev/null
+++ b/mkspecs/win32-g++/qplatformdefs.h
@@ -0,0 +1,96 @@
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+#ifdef UNICODE
+#ifndef _UNICODE
+#define _UNICODE
+#endif
+#endif
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+#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>
+
+#if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500)
+typedef enum {
+            NameUnknown           = 0, 
+    NameFullyQualifiedDN  = 1, 
+            NameSamCompatible  = 2, 
+            NameDisplay           = 3, 
+            NameUniqueId  = 6, 
+            NameCanonical  = 7, 
+            NameUserPrincipal  = 8, 
+            NameCanonicalEx  = 9, 
+    NameServicePrincipal  = 10, 
+            NameDnsDomain  = 12
+} EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT;
+#endif
+
+#define Q_FS_FAT
+#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_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
+
+
+#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/win32-g++/qtcrtentrypoint.cpp b/mkspecs/win32-g++/qtcrtentrypoint.cpp
new file mode 100644
index 0000000..87b7bcc
--- a/dev/null
+++ b/mkspecs/win32-g++/qtcrtentrypoint.cpp
@@ -0,0 +1,231 @@
+
+//This code is need to get the WinMain function called. Current MinGW runtimes tries to call main
+//before WinMain. Untill such time as MinGw runtime has been changed this is need.
+//Most of this code is taken from the MinGw runtime sources.
+
+
+#include <signal.h>
+#include <process.h>
+#include <float.h>
+#include <io.h>
+
+
+/*
+ * Setup the default file handles to have the _CRT_fmode mode, as well as
+ * any new files created by the user.
+ */
+
+extern int _fmode; 
+extern "C"  int* __p__fmode(void); /* To access the dll _fmode */
+extern int _CRT_fmode;
+
+static void _mingw32_init_fmode ()
+{
+  /* Don't set the std file mode if the user hasn't set any value for it. */
+  if (_CRT_fmode)
+    {
+      _fmode = _CRT_fmode;
+
+      /*
+       * This overrides the default file mode settings for stdin,
+       * stdout and stderr. At first I thought you would have to
+       * test with isatty, but it seems that the DOS console at
+       * least is smart enough to handle _O_BINARY stdout and
+       * still display correctly.
+       */
+      if (stdin)
+        {
+          _setmode (_fileno (stdin), _CRT_fmode);
+        }
+      if (stdout)
+        {
+          _setmode (_fileno (stdout), _CRT_fmode);
+        }
+      if (stderr)
+        {
+          _setmode (_fileno (stderr), _CRT_fmode);
+        }
+    }
+
+    /*  Now sync  the dll _fmode to the  one for this .exe.  */
+            *__p__fmode() = _fmode;
+
+}
+
+/* This function will be called when a trap occurs. Thanks to Jacob
+   Navia for his contribution. */
+static CALLBACK long _gnu_exception_handler (EXCEPTION_POINTERS * exception_data)
+{
+  void (*old_handler) (int);
+  long action = EXCEPTION_CONTINUE_SEARCH;
+  int reset_fpu = 0;
+
+  switch (exception_data->ExceptionRecord->ExceptionCode)
+    {
+    case EXCEPTION_ACCESS_VIOLATION:
+      /* test if the user has set SIGSEGV */
+      old_handler = signal (SIGSEGV, SIG_DFL);
+      if (old_handler == SIG_IGN)
+        {
+          /* this is undefined if the signal was raised by anything other
+             than raise ().  */
+          signal (SIGSEGV, SIG_IGN);
+          action = EXCEPTION_CONTINUE_EXECUTION;
+        }
+      else if (old_handler != SIG_DFL)
+        {
+          /* This means 'old' is a user defined function. Call it */
+          (*old_handler) (SIGSEGV);
+          action = EXCEPTION_CONTINUE_EXECUTION;
+        }
+      break;
+
+    case EXCEPTION_FLT_INVALID_OPERATION:
+    case EXCEPTION_FLT_DIVIDE_BY_ZERO:
+    case EXCEPTION_FLT_DENORMAL_OPERAND:
+    case EXCEPTION_FLT_OVERFLOW:
+    case EXCEPTION_FLT_UNDERFLOW:
+    case EXCEPTION_FLT_INEXACT_RESULT:
+      reset_fpu = 1;
+      /* fall through. */
+
+    case EXCEPTION_INT_DIVIDE_BY_ZERO:
+      /* test if the user has set SIGFPE */
+      old_handler = signal (SIGFPE, SIG_DFL);
+      if (old_handler == SIG_IGN)
+        {
+          signal (SIGFPE, SIG_IGN);
+          if (reset_fpu)
+            _fpreset ();
+          action = EXCEPTION_CONTINUE_EXECUTION;
+        }
+      else if (old_handler != SIG_DFL)
+        {
+          /* This means 'old' is a user defined function. Call it */
+          (*old_handler) (SIGFPE);
+          action = EXCEPTION_CONTINUE_EXECUTION;
+        }
+      break;
+
+    default:
+      break;
+    }
+  return action;
+}
+
+
+extern char __RUNTIME_PSEUDO_RELOC_LIST__;
+extern char __RUNTIME_PSEUDO_RELOC_LIST_END__;
+extern char _image_base__;
+
+typedef struct {
+    DWORD addend;
+    DWORD target;
+} runtime_pseudo_reloc;
+
+static void do_pseudo_reloc (void* start, void* end, void* base)
+{
+    DWORD reloc_target;
+    runtime_pseudo_reloc* r;
+    for (r = (runtime_pseudo_reloc*) start; r < (runtime_pseudo_reloc*) end; r++) {
+        reloc_target = (DWORD) base + r->target;
+        *((DWORD*) reloc_target) += r->addend;
+    }
+}
+
+void _pei386_runtime_relocator ()
+{
+    do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__,
+                     &__RUNTIME_PSEUDO_RELOC_LIST_END__,
+                     &_image_base__);
+}
+
+
+#ifdef __MSVCRT__
+#define __UNKNOWN_APP    0
+#define __CONSOLE_APP    1
+#define __GUI_APP        2
+extern "C" void __set_app_type(int);
+#endif /* __MSVCRT__ */
+
+        #define ISSPACE(a)(a == ' ' || a == '\t')
+
+int QtWinMainCRTStartup()
+{
+#ifdef __MSVCRT__
+    __set_app_type (__GUI_APP);
+#endif
+        
+    SetUnhandledExceptionFilter (_gnu_exception_handler);
+    
+    /*
+    * Initialize floating point unit.
+    */
+            _fpreset ();                /* Supplied by the runtime library. */
+    
+    /*
+    * Sets the default file mode.
+    * If _CRT_fmode is set, also set mode for stdin, stdout
+    * and stderr, as well
+    * NOTE: DLLs don't do this because that would be rude!
+    */
+    _mingw32_init_fmode ();
+    
+    /* Adust references to dllimported data that have non-zero offsets.  */
+    _pei386_runtime_relocator ();
+    
+    char *szCmd;
+    STARTUPINFO startinfo;
+    int nRet;
+    
+    /* Get the command line passed to the process. */
+    szCmd = GetCommandLineA ();
+    GetStartupInfo (&startinfo);
+    
+    /* Strip off the name of the application and any leading
+    * whitespace. */
+    if (szCmd) {
+        
+        while (ISSPACE (*szCmd)) {
+            szCmd++;
+        }
+        
+        /* On my system I always get the app name enclosed
+        * in quotes... */
+        if (*szCmd == '\"') {
+            do {
+                szCmd++;
+            } while (*szCmd != '\"' && *szCmd != '\0');
+            
+            if (*szCmd == '\"') {
+                szCmd++;
+            }
+        } else {
+        /* If no quotes then assume first token is program
+        * name. */
+            while (!ISSPACE (*szCmd) && *szCmd != '\0') {
+                szCmd++;
+            }
+        }
+        
+        while (ISSPACE (*szCmd)) {
+            szCmd++;
+        }
+    }
+    
+    nRet = WinMain (GetModuleHandle (NULL), NULL, szCmd,
+                    (startinfo.dwFlags & STARTF_USESHOWWINDOW) ?
+                     startinfo.wShowWindow : SW_SHOWDEFAULT);
+    
+    /*
+    * Perform exit processing for the C library. This means
+    * flushing output and calling 'atexit' registered functions.
+    */
+    _cexit ();
+    
+    ExitProcess (nRet);
+    
+    return 0;
+    
+}
+
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,12 +1,14 @@
 #
 # $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 ) {
@@ -21,23 +23,19 @@ 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)
@@ -50,7 +48,12 @@ 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
@@ -58,8 +61,10 @@ 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)
@@ -74,9 +79,9 @@ 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
@@ -94,6 +99,8 @@ 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
@@ -26,7 +26,7 @@
 #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
@@ -46,7 +46,7 @@
         #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
@@ -81,5 +81,7 @@
         # define W_OK2
         # define R_OK4
 
+typedef int mode_t;
+
 
 #endif // QPLATFORMDEFS_H
diff --git a/mkspecs/win32-msvc.net/qmake.conf b/mkspecs/win32-msvc.net/qmake.conf
index 92f7cc6..de8460d 100644
--- a/mkspecs/win32-msvc.net/qmake.conf
+++ b/mkspecs/win32-msvc.net/qmake.conf
@@ -1,13 +1,15 @@
 #
 # $Id$
 #
-# qmake configuration for Win32/Microsoft C++.NET
+# qmake configuration for win32-msvc.net
+#
+# Written for Microsoft C++.NET.
 #
 
         MAKEFILE_GENERATOR= MSVC.NET
         TEMPLATE        = app
-        CONFIG          += qt warn_on release incremental
-        DEFINES                 += UNICODE WIN32 NDEBUG
+        CONFIG          += qt warn_on release incremental flat link_prl precompile_header
+        DEFINES                 += UNICODE WIN32
 
 exists( $(QTDIR)\.qtwinconfig ) {
         include( $(QTDIR)\.qtwinconfig )
@@ -22,28 +24,22 @@ QMAKE_CFLAGS		= -nologo -Zm200 $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_WARN_ON= -W3
         QMAKE_CFLAGS_WARN_OFF= -W0
         QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O1)
-        QMAKE_CFLAGS_DEBUG= -Z7
+        QMAKE_CFLAGS_DEBUG= -Zi -Gm
         QMAKE_CFLAGS_MT         = -MD
-        QMAKE_CFLAGS_MT_DBG= -MD
+        QMAKE_CFLAGS_MT_DBG= -MDd
         QMAKE_CFLAGS_MT_DLL= -MD
-        QMAKE_CFLAGS_MT_DLLDBG= -MD
-        QMAKE_CFLAGS_ST         = -ML
-        QMAKE_CFLAGS_ST_DBG= -MLd
+        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_ON= $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
         QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
         QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
@@ -51,10 +47,13 @@ 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_ST= $$QMAKE_CFLAGS_ST
-        QMAKE_CXXFLAGS_ST_DBG= $$QMAKE_CFLAGS_ST_DBG
         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
@@ -62,8 +61,10 @@ 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)
@@ -77,12 +78,12 @@ 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_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 delayimp.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_LIBS_OPENGL= opengl32.lib glu32.lib
         QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll
 
         QMAKE_MOC       = $(QTDIR)\bin\moc.exe
@@ -98,7 +99,9 @@ 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
 
         VCPROJ_EXTENSION= .vcproj
-        VCSOLUTION_EXTENSION= .vcs
+        VCSOLUTION_EXTENSION= .sln
diff --git a/mkspecs/win32-msvc.net/qplatformdefs.h b/mkspecs/win32-msvc.net/qplatformdefs.h
index 76ed8af..d828db8 100644
--- a/mkspecs/win32-msvc.net/qplatformdefs.h
+++ b/mkspecs/win32-msvc.net/qplatformdefs.h
@@ -26,7 +26,7 @@
 #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
@@ -46,7 +46,7 @@
         #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
diff --git a/mkspecs/win32-msvc/qmake.conf b/mkspecs/win32-msvc/qmake.conf
index 6175be3..2d0c6da 100644
--- a/mkspecs/win32-msvc/qmake.conf
+++ b/mkspecs/win32-msvc/qmake.conf
@@ -1,12 +1,14 @@
 #
 # $Id$
 #
-# qmake configuration for Win32/Microsoft C++
+# qmake configuration for win32-msvc
+#
+# Written for Microsoft C++.
 #
 
         MAKEFILE_GENERATOR= MSVC
         TEMPLATE        = app
-        CONFIG          += qt warn_on release incremental flat
+        CONFIG          += qt warn_on release incremental flat link_prl precompile_header
         DEFINES                 += UNICODE
 
 exists( $(QTDIR)\.qtwinconfig ) {
@@ -15,7 +17,7 @@ exists( $(QTDIR)\.qtwinconfig ) {
 
         QMAKE_CC        = cl
         QMAKE_LEX       = flex
-        QMAKE_LEXFLAGS  = 
+        QMAKE_LEXFLAGS  =
         QMAKE_YACC      = byacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = -nologo -Zm200 $(CFLAGS_EXTRA)
@@ -28,16 +30,12 @@ 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)
@@ -50,7 +48,12 @@ 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
@@ -58,8 +61,10 @@ 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)
@@ -94,6 +99,8 @@ 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-msvc/qplatformdefs.h b/mkspecs/win32-msvc/qplatformdefs.h
index 76ed8af..d828db8 100644
--- a/mkspecs/win32-msvc/qplatformdefs.h
+++ b/mkspecs/win32-msvc/qplatformdefs.h
@@ -26,7 +26,7 @@
 #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
@@ -46,7 +46,7 @@
         #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
diff --git a/mkspecs/win32-msvc/win32app.dsp b/mkspecs/win32-msvc/win32app.dsp
index d09aa86..61d6a4a 100644
--- a/mkspecs/win32-msvc/win32app.dsp
+++ b/mkspecs/win32-msvc/win32app.dsp
@@ -41,14 +41,14 @@ RSC=rc.exe
 # PROP Output_Dir "$$MSVCDSP_TARGETDIRREL"
 # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
 # PROP Target_Dir ""
-# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "$$MSVCDSP_WINCONDEF" /D "_MBCS" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE
+# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "$$MSVCDSP_WINCONDEF" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE $$PRECOMPILED_FLAGS_REL
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD LINK32 $$MSVCDSP_LIBS $$MSVCDSP_VERSION /subsystem:$$MSVCDSP_SUBSYSTEM $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS $$QMAKE_LFLAGS_RELEASE
-$$MSVCDSP_REGSVR_REL
+# ADD LINK32 $$MSVCDSP_LIBS $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS $$QMAKE_LFLAGS_RELEASE $$PRECOMPILED_OBJECT
+$$MSVCDSP_POST_LINK_REL
 
 !ELSEIF  "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug"
 
@@ -62,14 +62,14 @@ $$MSVCDSP_REGSVR_REL
 # PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB"
 # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
 # PROP Target_Dir ""
-# ADD CPP $$MSVCDSP_MTDEFD /W3 /Gm $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "$$MSVCDSP_WINCONDEF" /D "_MBCS" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG
+# ADD CPP $$MSVCDSP_MTDEFD /W3 $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "$$MSVCDSP_WINCONDEF" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG  $$PRECOMPILED_FLAGS_DEB
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD LINK32 $$MSVCDSP_LIBS $$MSVCDSP_VERSION /subsystem:$$MSVCDSP_SUBSYSTEM $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS /pdbtype:sept $$QMAKE_LFLAGS_DEBUG
-$$MSVCDSP_REGSVR_DBG
+# ADD LINK32 $$MSVCDSP_LIBS $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS /pdbtype:sept $$QMAKE_LFLAGS_DEBUG $$PRECOMPILED_OBJECT
+$$MSVCDSP_POST_LINK_DBG
 
 !ENDIF 
 
diff --git a/mkspecs/win32-msvc/win32dll.dsp b/mkspecs/win32-msvc/win32dll.dsp
index 78b68d5..c619db4 100644
--- a/mkspecs/win32-msvc/win32dll.dsp
+++ b/mkspecs/win32-msvc/win32dll.dsp
@@ -42,14 +42,14 @@ RSC=rc.exe
 # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
-# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE
+# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE  $$PRECOMPILED_FLAGS_REL
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD LINK32 $$MSVCDSP_LIBS /dll $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS $$QMAKE_LFLAGS_RELEASE
-$$MSVCDSP_COPY_DLL_REL
+# ADD LINK32 $$MSVCDSP_LIBS /dll $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS $$QMAKE_LFLAGS_RELEASE $$PRECOMPILED_OBJECT
+$$MSVCDSP_POST_LINK_REL
 
 !ELSEIF  "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug"
 
@@ -64,14 +64,14 @@ $$MSVCDSP_COPY_DLL_REL
 # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
-# ADD CPP $$MSVCDSP_MTDEFD /W3 /Gm $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG
+# ADD CPP $$MSVCDSP_MTDEFD /W3 $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG  $$PRECOMPILED_FLAGS_DEB
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD LINK32 $$MSVCDSP_LIBS /dll $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS /pdbtype:sept $$QMAKE_LFLAGS_DEBUG
-$$MSVCDSP_COPY_DLL_DBG
+# ADD LINK32 $$MSVCDSP_LIBS /dll $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS /pdbtype:sept $$QMAKE_LFLAGS_DEBUG $$PRECOMPILED_OBJECT
+$$MSVCDSP_POST_LINK_DBG
 
 !ENDIF 
 
diff --git a/mkspecs/win32-msvc/win32lib.dsp b/mkspecs/win32-msvc/win32lib.dsp
index 70263c0..81d9f5a 100644
--- a/mkspecs/win32-msvc/win32lib.dsp
+++ b/mkspecs/win32-msvc/win32lib.dsp
@@ -40,12 +40,13 @@ RSC=rc.exe
 # PROP Output_Dir "$$MSVCDSP_TARGETDIRREL"
 # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
 # PROP Target_Dir ""
-# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE
+# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_LIB" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE $$PRECOMPILED_FLAGS_REL
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD LIB32 /nologo $$MSVCDSP_TARGET
+# ADD LIB32 /nologo $$MSVCDSP_TARGET $$PRECOMPILED_OBJECT
+$$MSVCDSP_POST_LINK_REL
 
 !ELSEIF  "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug"
 
@@ -59,12 +60,13 @@ LIB32=link.exe -lib
 # PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB"
 # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
 # PROP Target_Dir ""
-# ADD CPP $$MSVCDSP_MTDEFD /W3 /Gm $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS  $$QMAKE_CXXFLAGS_DEBUG
+# ADD CPP $$MSVCDSP_MTDEFD /W3 $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_LIB" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS  $$QMAKE_CXXFLAGS_DEBUG  $$PRECOMPILED_FLAGS_DEB
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD LIB32 /nologo $$MSVCDSP_TARGET
+# ADD LIB32 /nologo $$MSVCDSP_TARGET $$PRECOMPILED_OBJECT
+$$MSVCDSP_POST_LINK_DBG
 
 !ENDIF 
 
diff --git a/mkspecs/win32-visage/qmake.conf b/mkspecs/win32-visage/qmake.conf
index cbd0a7f..2db104d 100644
--- a/mkspecs/win32-visage/qmake.conf
+++ b/mkspecs/win32-visage/qmake.conf
@@ -12,15 +12,15 @@ QMAKE_LEX		= flex
         QMAKE_LEXFLAGS  = 
         QMAKE_YACC      = byacc
         QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    = -Q -Ft -Gd -Gm+ -qrtti=all $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS    = -Q -Ft -Gd -Gm+ -qrtti=all $(CFLAGS_EXTRA) $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_WARN_ON= -W3
         QMAKE_CFLAGS_WARN_OFF= -W0
-        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -Gl+ -O -Oc+)
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -Gl+ -O -Oc+))
         QMAKE_CFLAGS_DEBUG= -Fb* -Ti -Tm
         QMAKE_CFLAGS_YACC=
 
         QMAKE_CXX       = $$QMAKE_CC
-        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) $(CXXFLAGS_EXTRA)
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
         QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
@@ -36,7 +36,7 @@ QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$obj" $src
         QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$@" $<
 
         QMAKE_LINK      = icc -Tdp $(CFLAGS)
-        QMAKE_LFLAGS    = -nologo -code:RX -data:RW -def -noe $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS    = -nologo -code:RX -data:RW -def -noe $(LFLAGS_EXTRA) $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE= -OPTF
         QMAKE_LFLAGS_DEBUG= -de -br
         QMAKE_LFLAGS_CONSOLE= -pmtype:vio
@@ -44,7 +44,7 @@ QMAKE_LFLAGS_WINDOWS	= -pmtype:pm
 QMAKE_LFLAGS_CONSOLE_DLL= -DLL
 QMAKE_LFLAGS_WINDOWS_DLL= -DLL
 
-        QMAKE_LIBS      = $(LIBS_EXTRA)
+        QMAKE_LIBS      = $(LIBS_EXTRA) $(LIBS_EXTRA)
         QMAKE_LIBS_CONSOLE=
         QMAKE_LIBS_WINDOWS= user32.lib gdi32.lib comdlg32.lib imm32.lib winmm.lib ole32.lib uuid.lib wsock32.lib
         QMAKE_LIBS_QT   = $(QTDIR)\lib\qt.lib
diff --git a/mkspecs/win32-watcom/qmake.conf b/mkspecs/win32-watcom/qmake.conf
index fe6f3ed..cbe07bb 100644
--- a/mkspecs/win32-watcom/qmake.conf
+++ b/mkspecs/win32-watcom/qmake.conf
@@ -1,11 +1,13 @@
 #
 # $Id$
 #
-# qmake configuration for Win32/Watcom C++
+# qmake configuration for win32-watcom
+#
+# Written for Watcom C++, now OpenWatcom.
 #
 
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = wcl386
         QMAKE_LEX       = flex
@@ -62,4 +64,6 @@ 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= test -d
+        QMAKE_MKDIR     = mkdir -p