6 files changed, 27 insertions, 18 deletions
diff --git a/mkspecs/common/armcc.conf b/mkspecs/common/armcc.conf
index 2c765bc..4f178d7 100644
--- a/mkspecs/common/armcc.conf
+++ b/mkspecs/common/armcc.conf
@@ -37,5 +37,6 @@ QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_THREAD	+=
 
 QMAKE_AR                = armar --create
+QMAKE_LIB               = armar --create
 QMAKE_RANLIB            =
 
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf
index b899a2f..a195027 100644
--- a/mkspecs/common/symbian/symbian-makefile.conf
+++ b/mkspecs/common/symbian/symbian-makefile.conf
@@ -2,7 +2,11 @@
 # qmake configuration for makefile based symbian
 #
 
-MAKEFILE_GENERATOR	= SYMBIAN_UNIX
+contains(QMAKE_HOST.os,Windows) {
+    MAKEFILE_GENERATOR	= SYMBIAN_MINGW
+} else {
+    MAKEFILE_GENERATOR	= SYMBIAN_UNIX
+}
 
 include(symbian.conf)
 
@@ -29,6 +33,8 @@ QMAKE_PREFIX_STATICLIB =
 QMAKE_EXTENSION_STATICLIB = lib
 QMAKE_SYMBIAN_SHLIB   = 1
 
+QMAKE_LINK_OBJECT_SCRIPT = objects
+
 is_using_gnupoc {
     DEFINES *= __QT_PRODUCT_INCLUDE_IS_LOWERCASE__
 }
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 0eb1336..cfeb0bb 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -114,11 +114,11 @@ contains(QMAKE_HOST.os,Windows) {
 }
 
 QMAKE_IDL		  = midl
-QMAKE_LIB		  = ar -ru
-QMAKE_RC		  = windres
 QMAKE_ZIP		  = zip -r -9
 QMAKE_UNZIP               = unzip -o
 
+QMAKE_WRITE_DEFAULT_RC    = 1
+
 QMAKE_TAR                 = tar -cf
 QMAKE_GZIP                = gzip -9f
 
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index 8bb92be..678838c 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -1,6 +1,11 @@
 symbian-armcc {
     QMAKE_CFLAGS += $$QMAKE_CFLAGS.ARMCC
     QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS.ARMCC
+    # This is to prevent inclusion of the shipped RVCT headers, which are often in the
+    # environment variable RVCTxxINC by default. -J prevents the searching of that location,
+    # but needs a path, so just specify somewhere guaranteed not to contain header files.
+    QMAKE_CFLAGS += -J$${EPOCROOT}epoc32/ignore_this_path
+    QMAKE_CXXFLAGS += -J$${EPOCROOT}epoc32/ignore_this_path
 } else:symbian-gcce {
     QMAKE_CFLAGS += $$QMAKE_CFLAGS.GCCE
     QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS.GCCE
@@ -235,12 +240,7 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") {
 }
 
 # Symbian resource files
-symbian-armcc: {
-    SYMBIAN_RVCT22INC=$$(RVCT22INC)
-    !isEmpty(SYMBIAN_RVCT22INC):symbian_resources_INCLUDES = -I$${SYMBIAN_RVCT22INC}
-}
-symbian_resources_INCLUDES = $$replace(symbian_resources_INCLUDES, ",", " -I")
-symbian_resources_INCLUDES += $$join(INCLUDEPATH, " -I", "-I")
+symbian_resources_INCLUDES = $$join(INCLUDEPATH, " -I", "-I")
 symbian_resources_DEFINES = $$join(DEFINES, " -D", "-D")
 symbian_resources_DEFINES += -D__QT_SYMBIAN_RESOURCE__
 symbian_resources_RCC_DIR = $$replace(RCC_DIR, "/$", "")
diff --git a/mkspecs/symbian-gcce/qmake.conf b/mkspecs/symbian-gcce/qmake.conf
index a31e6e4..3992681 100644
--- a/mkspecs/symbian-gcce/qmake.conf
+++ b/mkspecs/symbian-gcce/qmake.conf
@@ -72,16 +72,16 @@ QMAKE_LFLAGS += --target1-abs \
 QMAKE_LIBDIR	+= $${EPOCROOT}epoc32/release/armv5/udeb/
 
 # g++ knows the path to the gcc-shipped-libs, ld doesn't. So cache the full path in the generate Makefile
-QMAKE_GCC_SEARCH_DIRS =$$system($$QMAKE_CXX -print-search-dirs)
-for(line, QMAKE_GCC_SEARCH_DIRS) {
-    contains(line, "libraries:") {
-        foundIt="1"
-    } else {
-        contains(foundIt, "1") {
-            QMAKE_LFLAGS += $$replace(line, "[=:]", " -L")
-        }
-    }
+QMAKE_GCC_SEARCH_DIRS = $$system($$QMAKE_CXX -print-search-dirs)
+QMAKE_GCC_SEARCH_DIRS = "$$join(QMAKE_GCC_SEARCH_DIRS, " ")"
+QMAKE_GCC_SEARCH_DIRS = $$replace(QMAKE_GCC_SEARCH_DIRS, ".*libraries: *", "")
+QMAKE_GCC_SEARCH_DIRS = $$replace(QMAKE_GCC_SEARCH_DIRS, "=", "")
+contains(QMAKE_HOST.os,Windows) {
+    QMAKE_GCC_SEARCH_DIRS = $$split(QMAKE_GCC_SEARCH_DIRS, ;)
+} else {
+    QMAKE_GCC_SEARCH_DIRS = $$split(QMAKE_GCC_SEARCH_DIRS, :)
 }
+for(line, QMAKE_GCC_SEARCH_DIRS):QMAKE_LIBDIR += $$line
 
 QMAKE_LIBDIR += $${EPOCROOT}epoc32/release/armv5/lib
 
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index ec216aa..8e49b18 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -62,6 +62,8 @@ QMAKE_LFLAGS_WINDOWS	= -Wl,-subsystem,windows
 QMAKE_LFLAGS_DLL        = -shared
 QMAKE_LINK_OBJECT_MAX	= 10
 QMAKE_LINK_OBJECT_SCRIPT= object_script
+QMAKE_PREFIX_STATICLIB  = lib
+QMAKE_EXTENSION_STATICLIB = a
 
 
 QMAKE_LIBS		=