Reorganized the Symbian build system profiles.

Now we try share as much as possible between the different Symbian
build systems, so that changes made to the MMP systems will also work
in the makefile based one.

13 files changed, 364 insertions, 360 deletions

diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf
new file mode 100644
index 0000000..bf4f43c
--- /dev/null
+++ b/mkspecs/common/symbian/symbian-makefile.conf
@@ -0,0 +1,32 @@
+#
+# qmake configuration for makefile based symbian
+#
+
+MAKEFILE_GENERATOR	= UNIX
+
+include(symbian.conf)
+
+QMAKE_LIBDIR_QT         = $$[QT_INSTALL_LIBS]
+
+QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
+QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
+QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+
+QMAKE_CFLAGS		+= --dllimport_runtime --preinclude rvct2_2.h  --diag_suppress 186,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --export_all_vtbl --no_vfe --apcs /inter
+QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS --no_parse_templates
+QMAKE_LFLAGS      	+= --diag_suppress 6331,6780 --bpabi --reloc --datacompressor=off --split --rw-base 0x800000 --dll --no_scanlib
+QMAKE_LFLAGS_APP        += --entry _E32Startup
+QMAKE_LFLAGS_SHLIB      += --entry _E32Dll
+
+DEFINES              += __SYMBIAN32__ EKA2 __S60_50__ __S60_3X__ __SERIES60_3X__ __EPOC32__ __MARM__ __EABI__ __ARMCC__ __ARMcc_2__ __ARMCC_2_2__ __MARM_ARMV5__ __MARM_THUMB__ __MARM_INTERWORK__ __DLL__ _UNICODE __SUPPORT_CPP_EXCEPTIONS__
+
+include(../../common/unix.conf)
+
+QMAKE_PREFIX_SHLIB    =
+QMAKE_EXTENSION_SHLIB = dll
+CONFIG *= no_plugin_name_prefix
+QMAKE_EXTENSION_PLUGIN = dll
+QMAKE_PREFIX_STATICLIB =
+QMAKE_EXTENSION_STATICLIB = lib
+QMAKE_SYMBIAN_SHLIB   = 1
diff --git a/mkspecs/common/symbian/symbian-mmp.conf b/mkspecs/common/symbian/symbian-mmp.conf
new file mode 100644
index 0000000..3a22647
--- /dev/null
+++ b/mkspecs/common/symbian/symbian-mmp.conf
@@ -0,0 +1,50 @@
+#
+# qmake configuration for symbian-*
+#
+
+QMAKE_MOC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
+QMAKE_UIC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
+QMAKE_IDC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
+
+include(symbian.conf)
+
+symbian-abld {
+# Versions of abld prior to Symbian^3 have a bug where you cannot remove something from the command line without replacing it
+# Rather than figure out which version of abld we're using, we'll replace the command with a macro *that should never be used*
+    MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA = "OPTION_REPLACE ARMCC --export_all_vtbl -D__QT_NOEFFECTMACRO_DONOTUSE"
+} else {
+    MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA = "OPTION_REPLACE ARMCC --export_all_vtbl // don't use --export_all_vtbl"
+}
+MMP_RULES += PAGED
+MMP_RULES += $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA
+SYMBIAN_PLATFORMS = WINSCW GCCE ARMV5 ARMV6
+
+# Legacy support requires some hardcoded stdapis paths. 
+INCLUDEPATH = \
+    $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off \
+    $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian \
+    $${EPOCROOT}epoc32/include \
+    $$OS_LAYER_LIBC_SYSTEMINCLUDE \
+    $$INCLUDEPATH
+    
+# Supports S60 3.0, 3.1, 3.2 and 5.0 by default
+default_deployment.pkg_prerules = \
+    "; Default HW/platform dependencies" \
+    "[0x101F7961],0,0,0,{\"S60ProductID\"}" \
+    "[0x102032BE],0,0,0,{\"S60ProductID\"}" \
+    "[0x102752AE],0,0,0,{\"S60ProductID\"}" \
+    "[0x1028315F],0,0,0,{\"S60ProductID\"}" \
+    " "
+
+DEPLOYMENT += default_deployment
+
+exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Series60v5.0.sis )|exists($${EPOCROOT}epoc32/data/z/system/install/Series60v5.0.sis) {
+    S60_VERSION = 5.0
+} else {
+    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Series60v3.2.sis )|exists($${EPOCROOT}epoc32/data/z/system/install/Series60v3.2.sis) {
+        S60_VERSION = 3.2
+    } else {
+        S60_VERSION = 3.1
+        MMP_RULES -= PAGED
+    }
+}
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 0f06b92..c05bd3d 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -1,9 +1,9 @@
 #
-# qmake configuration for symbian-*
+# qmake configuration for all symbian mkspecs
 #
 
 TEMPLATE		= app
-CONFIG			+= qt warn_on release incremental
+CONFIG			+= qt warn_on release incremental link_prl rvct_linker
 QT			+= core gui
 QMAKE_INCREMENTAL_STYLE = sublib
 
@@ -13,7 +13,6 @@ QMAKE_COMPILER_DEFINES  += SYMBIAN
 QMAKE_EXT_OBJ           = .o
 QMAKE_EXT_RES           = _res.o
 
-QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= byacc
@@ -26,7 +25,6 @@ QMAKE_CFLAGS_RELEASE	=
 QMAKE_CFLAGS_DEBUG	=
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 
-QMAKE_CXX		= g++
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
 QMAKE_CXXFLAGS.CW	= 
 QMAKE_CXXFLAGS.ARMCC	= --visibility_inlines_hidden
@@ -45,12 +43,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
 QMAKE_INCDIR		=
 QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
 
-QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
-QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
-QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-QMAKE_LINK              =
 QMAKE_LFLAGS            =
 QMAKE_LFLAGS.ARMCC      = 
 QMAKE_LFLAGS_EXCEPTIONS_ON =
@@ -75,75 +67,33 @@ QMAKE_LIBS_QT_ENTRY     = -llibcrt0.lib
 QMAKE_LIBS_S60          = -lavkon
 
 !isEmpty(QMAKE_SH) {
-    QMAKE_COPY           = cp
-    QMAKE_COPY_DIR       = cp -r
-    QMAKE_MOVE           = mv
-    QMAKE_DEL_FILE       = rm -f
-    QMAKE_MKDIR          = mkdir
-    QMAKE_DEL_DIR        = rmdir
-    QMAKE_CHK_DIR_EXISTS = test -d
+    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_CHK_DIR_EXISTS  = test -d
+    QMAKE_MKDIR           = mkdir -p
 } else {
-    QMAKE_COPY           = copy /y
-    QMAKE_COPY_DIR       = xcopy /s /q /y /i
-    QMAKE_MOVE           = move
-    QMAKE_DEL_FILE       = del
-    QMAKE_MKDIR          = mkdir
-    QMAKE_DEL_DIR        = rmdir
-    QMAKE_CHK_DIR_EXISTS = if not exist
+    QMAKE_COPY            = copy /y
+    QMAKE_COPY_DIR        = xcopy /s /q /y /i
+    QMAKE_MOVE            = move
+    QMAKE_DEL_FILE        = del
+    QMAKE_MKDIR           = mkdir
+    QMAKE_DEL_DIR         = rmdir
+    QMAKE_CHK_DIR_EXISTS  = if not exist
 }
 
-QMAKE_MOC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
-QMAKE_UIC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
-QMAKE_IDC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
+QMAKE_IDL		  = midl
+QMAKE_LIB		  = ar -ru
+QMAKE_RC		  = windres
+QMAKE_ZIP		  = zip -r -9
 
-QMAKE_IDL		= midl
-QMAKE_LIB		= ar -ru
-QMAKE_RC		= windres
-QMAKE_ZIP		= zip -r -9
+QMAKE_TAR                 = tar -cf
+QMAKE_GZIP                = gzip -9f
 
-QMAKE_STRIP		= strip
-QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
+QT_ARCH               = symbian
 
 load(qt_config)
 load(platform_paths)
-
-symbian-abld {
-# Versions of abld prior to Symbian^3 have a bug where you cannot remove something from the command line without replacing it
-# Rather than figure out which version of abld we're using, we'll replace the command with a macro *that should never be used*
-    MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA = "OPTION_REPLACE ARMCC --export_all_vtbl -D__QT_NOEFFECTMACRO_DONOTUSE"
-} else {
-    MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA = "OPTION_REPLACE ARMCC --export_all_vtbl // don't use --export_all_vtbl"
-}
-MMP_RULES += PAGED
-MMP_RULES += $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA
-SYMBIAN_PLATFORMS = WINSCW GCCE ARMV5 ARMV6
-
-# Legacy support requires some hardcoded stdapis paths. 
-INCLUDEPATH = \
-    $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off \
-    $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian \
-    $${EPOCROOT}epoc32/include \
-    $$OS_LAYER_LIBC_SYSTEMINCLUDE \
-    $$INCLUDEPATH
-    
-# Supports S60 3.0, 3.1, 3.2 and 5.0 by default
-default_deployment.pkg_prerules = \
-    "; Default HW/platform dependencies" \
-    "[0x101F7961],0,0,0,{\"S60ProductID\"}" \
-    "[0x102032BE],0,0,0,{\"S60ProductID\"}" \
-    "[0x102752AE],0,0,0,{\"S60ProductID\"}" \
-    "[0x1028315F],0,0,0,{\"S60ProductID\"}" \
-    " "
-
-DEPLOYMENT += default_deployment
-
-exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Series60v5.0.sis )|exists($${EPOCROOT}epoc32/data/z/system/install/Series60v5.0.sis) {
-    S60_VERSION = 5.0
-} else {
-    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Series60v3.2.sis )|exists($${EPOCROOT}epoc32/data/z/system/install/Series60v3.2.sis) {
-        S60_VERSION = 3.2
-    } else {
-        S60_VERSION = 3.1
-        MMP_RULES -= PAGED
-    }
-}
diff --git a/mkspecs/features/symbian/debug.prf b/mkspecs/features/symbian/debug.prf
new file mode 100644
index 0000000..19f5348
--- /dev/null
+++ b/mkspecs/features/symbian/debug.prf
@@ -0,0 +1 @@
+QMAKE_LIBDIR_QT        += $${EPOCROOT}epoc32/release/armv5/udeb
diff --git a/mkspecs/features/symbian/platform_paths.prf b/mkspecs/features/symbian/platform_paths.prf
index bec9811..e06ffd4 100644
--- a/mkspecs/features/symbian/platform_paths.prf
+++ b/mkspecs/features/symbian/platform_paths.prf
@@ -50,6 +50,12 @@
 #
 # ==============================================================================
 
+symbian-abld|symbian-sbsv2 {
+    epocroot_prefix = /
+} else {
+    epocroot_prefix = $${EPOCROOT}
+}
+
 exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
     
     # Load platform specific paths
@@ -66,10 +72,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(APP_LAYER_SDK_EXPORT_PATH) {
-             return (/epoc32/include/app/$$1)
+             return ($${epocroot_prefix}epoc32/include/app/$$1)
         }
         defineReplace(APP_LAYER_PUBLIC_EXPORT_PATH) {
-             return (/epoc32/include/app/$$1)
+             return ($${epocroot_prefix}epoc32/include/app/$$1)
         }
 
         # ---------------------------------------
@@ -77,10 +83,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(APP_LAYER_DOMAIN_EXPORT_PATH) {
-             return (/epoc32/include/platform/app/$$1)
+             return ($${epocroot_prefix}epoc32/include/platform/app/$$1)
         }
         defineReplace(APP_LAYER_PLATFORM_EXPORT_PATH) {
-             return (/epoc32/include/platform/app/$$1)
+             return ($${epocroot_prefix}epoc32/include/platform/app/$$1)
         }
 
         # ---------------------------------------
@@ -88,10 +94,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(MW_LAYER_SDK_EXPORT_PATH) {
-             return (/epoc32/include/mw/$$1)
+             return ($${epocroot_prefix}epoc32/include/mw/$$1)
         }
         defineReplace(MW_LAYER_PUBLIC_EXPORT_PATH) {
-             return (/epoc32/include/mw/$$1)
+             return ($${epocroot_prefix}epoc32/include/mw/$$1)
         }
 
         # ---------------------------------------
@@ -99,10 +105,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(MW_LAYER_DOMAIN_EXPORT_PATH) {
-             return (/epoc32/include/platform/mw/$$1)
+             return ($${epocroot_prefix}epoc32/include/platform/mw/$$1)
         }
         defineReplace(MW_LAYER_PLATFORM_EXPORT_PATH) {
-             return (/epoc32/include/platform/mw/$$1)
+             return ($${epocroot_prefix}epoc32/include/platform/mw/$$1)
         }
 
         # ---------------------------------------
@@ -110,11 +116,11 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(OSEXT_LAYER_SDK_EXPORT_PATH) {
-             return (/epoc32/include/$$1)
+             return ($${epocroot_prefix}epoc32/include/$$1)
         }
         # WARNING: If the following path changes see the exists() function around line 219
         defineReplace(OS_LAYER_PUBLIC_EXPORT_PATH) {
-             return (/epoc32/include/$$1)
+             return ($${epocroot_prefix}epoc32/include/$$1)
         }
 
         # ---------------------------------------
@@ -122,10 +128,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(OSEXT_LAYER_DOMAIN_EXPORT_PATH) {
-             return (/epoc32/include/platform/$$1)
+             return ($${epocroot_prefix}epoc32/include/platform/$$1)
         }
         defineReplace(OS_LAYER_PLATFORM_EXPORT_PATH) {
-             return (/epoc32/include/platform/$$1)
+             return ($${epocroot_prefix}epoc32/include/platform/$$1)
         }
 
         # ---------------------------------------
@@ -152,18 +158,18 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # the headers come from middleware or os-layer  => thus they are first.
 
         APP_LAYER_SYSTEMINCLUDE = \
-         /epoc32/include \
-         /epoc32/include/mw \
-         /epoc32/include/platform/mw \
-         /epoc32/include/platform \
-         /epoc32/include/app \
-         /epoc32/include/platform/app \
-         /epoc32/include/platform/loc \
-         /epoc32/include/platform/mw/loc \
-         /epoc32/include/platform/app/loc \
-         /epoc32/include/platform/loc/sc \
-         /epoc32/include/platform/mw/loc/sc \
-         /epoc32/include/platform/app/loc/sc
+         $${epocroot_prefix}epoc32/include \
+         $${epocroot_prefix}epoc32/include/mw \
+         $${epocroot_prefix}epoc32/include/platform/mw \
+         $${epocroot_prefix}epoc32/include/platform \
+         $${epocroot_prefix}epoc32/include/app \
+         $${epocroot_prefix}epoc32/include/platform/app \
+         $${epocroot_prefix}epoc32/include/platform/loc \
+         $${epocroot_prefix}epoc32/include/platform/mw/loc \
+         $${epocroot_prefix}epoc32/include/platform/app/loc \
+         $${epocroot_prefix}epoc32/include/platform/loc/sc \
+         $${epocroot_prefix}epoc32/include/platform/mw/loc/sc \
+         $${epocroot_prefix}epoc32/include/platform/app/loc/sc
 
         # This define statements defines the include paths, which are intended to be
         # used in the pro-files that are part of the middleware-layer. It includes all 
@@ -171,14 +177,14 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # middleware-layer components. 
 
         MW_LAYER_SYSTEMINCLUDE = \
-         /epoc32/include \
-         /epoc32/include/mw \
-         /epoc32/include/platform/mw \
-         /epoc32/include/platform \
-         /epoc32/include/platform/loc \
-         /epoc32/include/platform/mw/loc \
-         /epoc32/include/platform/loc/sc \
-         /epoc32/include/platform/mw/loc/sc
+         $${epocroot_prefix}epoc32/include \
+         $${epocroot_prefix}epoc32/include/mw \
+         $${epocroot_prefix}epoc32/include/platform/mw \
+         $${epocroot_prefix}epoc32/include/platform \
+         $${epocroot_prefix}epoc32/include/platform/loc \
+         $${epocroot_prefix}epoc32/include/platform/mw/loc \
+         $${epocroot_prefix}epoc32/include/platform/loc/sc \
+         $${epocroot_prefix}epoc32/include/platform/mw/loc/sc
 
         # This define statements defines the include paths, which are intended to be
         # used in the pro-files that are part of the  osextensions-layer. It includes all
@@ -186,10 +192,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # os-layer components. 
 
         OS_LAYER_SYSTEMINCLUDE = \
-         /epoc32/include \
-         /epoc32/include/platform \
-         /epoc32/include/platform/loc \
-         /epoc32/include/platform/loc/sc
+         $${epocroot_prefix}epoc32/include \
+         $${epocroot_prefix}epoc32/include/platform \
+         $${epocroot_prefix}epoc32/include/platform/loc \
+         $${epocroot_prefix}epoc32/include/platform/loc/sc
 
         # This define statements defines the include paths, which are intended to be
         # used in the pro-files that are part of the os-layer. This is intended 
@@ -198,7 +204,7 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # 2 files already contain the /epoc32/include  as system include path.
 
         OS_LAYER_KERNEL_SYSTEMINCLUDE = \
-         /epoc32/include/platform
+         $${epocroot_prefix}epoc32/include/platform
 
 
         # ---------------------------------------
@@ -235,19 +241,19 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
               
         defineReplace(CORE_APP_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/app/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/core/app/$$1)
         }
         defineReplace(CORE_MW_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/mw/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/core/mw/$$1)
         }
         defineReplace(CORE_OSEXT_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/os/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/core/os/$$1)
         }
         defineReplace(CORE_OS_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/os/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/core/os/$$1)
         }
         defineReplace(CORE_ADAPT_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/$$1)
         }
         
         # You need to define the following in pro-file, if you are using the stllib:
@@ -263,10 +269,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(APP_LAYER_SDK_EXPORT_PATH) {
-             return (/epoc32/include/applications/$$1)
+             return ($${epocroot_prefix}epoc32/include/applications/$$1)
         }
         defineReplace(APP_LAYER_PUBLIC_EXPORT_PATH) {
-             return (/epoc32/include/applications/$$1)
+             return ($${epocroot_prefix}epoc32/include/applications/$$1)
         }
 
         # ---------------------------------------
@@ -274,10 +280,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(APP_LAYER_DOMAIN_EXPORT_PATH) {
-             return (/epoc32/include/domain/applications/$$1)
+             return ($${epocroot_prefix}epoc32/include/domain/applications/$$1)
         }
         defineReplace(APP_LAYER_PLATFORM_EXPORT_PATH) {
-             return (/epoc32/include/domain/applications/$$1)
+             return ($${epocroot_prefix}epoc32/include/domain/applications/$$1)
         }
 
         # ---------------------------------------
@@ -285,10 +291,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(MW_LAYER_SDK_EXPORT_PATH) {
-             return (/epoc32/include/middleware/$$1)
+             return ($${epocroot_prefix}epoc32/include/middleware/$$1)
         }
         defineReplace(MW_LAYER_PUBLIC_EXPORT_PATH) {
-             return (/epoc32/include/middleware/$$1)
+             return ($${epocroot_prefix}epoc32/include/middleware/$$1)
         }
 
         # ---------------------------------------
@@ -296,10 +302,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(MW_LAYER_DOMAIN_EXPORT_PATH) {
-             return (/epoc32/include/domain/middleware/$$1)
+             return ($${epocroot_prefix}epoc32/include/domain/middleware/$$1)
         }
         defineReplace(MW_LAYER_PLATFORM_EXPORT_PATH) {
-             return (/epoc32/include/domain/middleware/$$1)
+             return ($${epocroot_prefix}epoc32/include/domain/middleware/$$1)
         }
 
         # ---------------------------------------
@@ -307,11 +313,11 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(OSEXT_LAYER_SDK_EXPORT_PATH) {
-             return (/epoc32/include/osextensions/$$1)
+             return ($${epocroot_prefix}epoc32/include/osextensions/$$1)
         }
         # WARNING: If the following path changes see the exists() function around line 430
         defineReplace(OS_LAYER_PUBLIC_EXPORT_PATH) {
-             return (/epoc32/include/osextensions/$$1)
+             return ($${epocroot_prefix}epoc32/include/osextensions/$$1)
         }
 
         # ---------------------------------------
@@ -319,10 +325,10 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
 
         defineReplace(OSEXT_LAYER_DOMAIN_EXPORT_PATH) {
-             return (/epoc32/include/domain/osextensions/$$1)
+             return ($${epocroot_prefix}epoc32/include/domain/osextensions/$$1)
         }
         defineReplace(OS_LAYER_PLATFORM_EXPORT_PATH) {
-             return (/epoc32/include/domain/osextensions/$$1)
+             return ($${epocroot_prefix}epoc32/include/domain/osextensions/$$1)
         }
 
         # ---------------------------------------
@@ -349,20 +355,20 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # the headers come from middleware or os-layer  => thus they are first.
 
         APP_LAYER_SYSTEMINCLUDE = \
-         /epoc32/include \
-         /epoc32/include/oem \
-         /epoc32/include/middleware \
-         /epoc32/include/domain/middleware \
-         /epoc32/include/osextensions \
-         /epoc32/include/domain/osextensions \
-         /epoc32/include/applications \
-         /epoc32/include/domain/applications \
-         /epoc32/include/domain/osextensions/loc \
-         /epoc32/include/domain/middleware/loc \
-         /epoc32/include/domain/applications/loc \
-         /epoc32/include/domain/osextensions/loc/sc \
-         /epoc32/include/domain/middleware/loc/sc \
-         /epoc32/include/domain/applications/loc/sc
+         $${epocroot_prefix}epoc32/include \
+         $${epocroot_prefix}epoc32/include/oem \
+         $${epocroot_prefix}epoc32/include/middleware \
+         $${epocroot_prefix}epoc32/include/domain/middleware \
+         $${epocroot_prefix}epoc32/include/osextensions \
+         $${epocroot_prefix}epoc32/include/domain/osextensions \
+         $${epocroot_prefix}epoc32/include/applications \
+         $${epocroot_prefix}epoc32/include/domain/applications \
+         $${epocroot_prefix}epoc32/include/domain/osextensions/loc \
+         $${epocroot_prefix}epoc32/include/domain/middleware/loc \
+         $${epocroot_prefix}epoc32/include/domain/applications/loc \
+         $${epocroot_prefix}epoc32/include/domain/osextensions/loc/sc \
+         $${epocroot_prefix}epoc32/include/domain/middleware/loc/sc \
+         $${epocroot_prefix}epoc32/include/domain/applications/loc/sc
 
         # This define statements defines the include paths, which are intended to be
         # used in the pro-files that are part of the middleware-layer. It includes all 
@@ -370,16 +376,16 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # middleware-layer components. 
 
         MW_LAYER_SYSTEMINCLUDE = \
-         /epoc32/include \
-         /epoc32/include/oem \
-         /epoc32/include/middleware \
-         /epoc32/include/domain/middleware \
-         /epoc32/include/osextensions \
-         /epoc32/include/domain/osextensions \
-         /epoc32/include/domain/osextensions/loc \
-         /epoc32/include/domain/middleware/loc \
-         /epoc32/include/domain/osextensions/loc/sc \
-         /epoc32/include/domain/middleware/loc/sc
+         $${epocroot_prefix}epoc32/include \
+         $${epocroot_prefix}epoc32/include/oem \
+         $${epocroot_prefix}epoc32/include/middleware \
+         $${epocroot_prefix}epoc32/include/domain/middleware \
+         $${epocroot_prefix}epoc32/include/osextensions \
+         $${epocroot_prefix}epoc32/include/domain/osextensions \
+         $${epocroot_prefix}epoc32/include/domain/osextensions/loc \
+         $${epocroot_prefix}epoc32/include/domain/middleware/loc \
+         $${epocroot_prefix}epoc32/include/domain/osextensions/loc/sc \
+         $${epocroot_prefix}epoc32/include/domain/middleware/loc/sc
 
         # This define statements defines the include paths, which are intended to be
         # used in the pro-files that are part of the  osextensions-layer. It includes all
@@ -387,12 +393,12 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # os-layer components. 
 
         OS_LAYER_SYSTEMINCLUDE = \
-         /epoc32/include \
-         /epoc32/include/oem \
-         /epoc32/include/osextensions \
-         /epoc32/include/domain/osextensions \
-         /epoc32/include/domain/osextensions/loc \
-         /epoc32/include/domain/osextensions/loc/sc
+         $${epocroot_prefix}epoc32/include \
+         $${epocroot_prefix}epoc32/include/oem \
+         $${epocroot_prefix}epoc32/include/osextensions \
+         $${epocroot_prefix}epoc32/include/domain/osextensions \
+         $${epocroot_prefix}epoc32/include/domain/osextensions/loc \
+         $${epocroot_prefix}epoc32/include/domain/osextensions/loc/sc
 
         # This define statements defines the include paths, which are intended to be
         # used in the pro-files that are part of the os-layer. This is intended 
@@ -401,9 +407,9 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # 2 files already contain the /epoc32/include  as system include path.
 
         OS_LAYER_KERNEL_SYSTEMINCLUDE = \
-         /epoc32/include/oem \
-         /epoc32/include/osextensions \
-         /epoc32/include/domain/osextensions
+         $${epocroot_prefix}epoc32/include/oem \
+         $${epocroot_prefix}epoc32/include/osextensions \
+         $${epocroot_prefix}epoc32/include/domain/osextensions
 
 
         # ---------------------------------------
@@ -413,38 +419,38 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
 
         OS_LAYER_LIBC_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis) \
                                       $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/sys) \
-                                      /epoc32/include/stdapis \
-                                      /epoc32/include/stdapis/sys
+                                      $${epocroot_prefix}epoc32/include/stdapis \
+                                      $${epocroot_prefix}epoc32/include/stdapis/sys
 
         OS_LAYER_GLIB_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0) \
                                       $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/glib) \
                                       $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/gObject) \
-                                      /epoc32/include/stdapis/glib-2.0 \
-                                      /epoc32/include/stdapis/glib-2.0/glib \
-                                      /epoc32/include/stdapis/glib-2.0/gObject
+                                      $${epocroot_prefix}epoc32/include/stdapis/glib-2.0 \
+                                      $${epocroot_prefix}epoc32/include/stdapis/glib-2.0/glib \
+                                      $${epocroot_prefix}epoc32/include/stdapis/glib-2.0/gObject
 
         OS_LAYER_SSL_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/openssl) \
-                                     /epoc32/include/stdapis/openssl
+                                     $${epocroot_prefix}epoc32/include/stdapis/openssl
 
         # stlportv5 is preferred over stlport as it has the throwing version of operator new
         exists($${EPOCROOT}epoc32/include/osextensions/stdapis/stlportv5)|exists($${EPOCROOT}epoc32/include/stdapis/stlportv5) {
             OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlportv5) \
-                                            /epoc32/include/stdapis/stlportv5
+                                            $${epocroot_prefix}epoc32/include/stdapis/stlportv5
         } else {
             OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlport) \
-                                            /epoc32/include/stdapis/stlport
+                                            $${epocroot_prefix}epoc32/include/stdapis/stlport
         }
         
         OS_LAYER_BOOST_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/boost) \
-                                       /epoc32/include/stdapis/boost
+                                       $${epocroot_prefix}epoc32/include/stdapis/boost
 
         OS_LAYER_DBUS_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/dbus-1.0) \
                                       $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/dbus-1.0/dbus) \
-                                      /epoc32/include/stdapis/dbus-1.0 \
-                                      /epoc32/include/stdapis/dbus-1.0/dbus
+                                      $${epocroot_prefix}epoc32/include/stdapis/dbus-1.0 \
+                                      $${epocroot_prefix}epoc32/include/stdapis/dbus-1.0/dbus
 
         OS_LAYER_LIBUTILITY_SYSTEMINCLUDE = $$OS_LAYER_PLATFORM_EXPORT_PATH(stdapis/utility) \
-                                            /epoc32/include/stdapis/utility
+                                            $${epocroot_prefix}epoc32/include/stdapis/utility
 
         # ---------------------------------------
         # Definitions to export IBY files to different folders where they will be taken 
@@ -452,19 +458,19 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # ---------------------------------------
               
         defineReplace(CORE_APP_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/app/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/core/app/$$1)
         }
         defineReplace(CORE_MW_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/mw/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/core/mw/$$1)
         }
         defineReplace(CORE_OSEXT_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/osext/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/core/osext/$$1)
         }
         defineReplace(CORE_OS_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/osext/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/core/osext/$$1)
         }
         defineReplace(CORE_ADAPT_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/$$1)
+            return($${epocroot_prefix}epoc32/rom/include/$$1)
         }
         
         # You need to define the following in pro-file, if you are using the stllib:
@@ -476,5 +482,4 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
     } 
 }
 
-
-    
+epocroot_prefix =
diff --git a/mkspecs/features/symbian/release.prf b/mkspecs/features/symbian/release.prf
new file mode 100644
index 0000000..abfa3ac
--- /dev/null
+++ b/mkspecs/features/symbian/release.prf
@@ -0,0 +1 @@
+QMAKE_LIBDIR_QT        += $${EPOCROOT}epoc32/release/armv5/urel
diff --git a/mkspecs/symbian-abld/qmake.conf b/mkspecs/symbian-abld/qmake.conf
index 499bf63..b83876d 100644
--- a/mkspecs/symbian-abld/qmake.conf
+++ b/mkspecs/symbian-abld/qmake.conf
@@ -6,4 +6,4 @@
 
 MAKEFILE_GENERATOR	= SYMBIAN_ABLD
 
-include(../common/symbian/symbian.conf)
+include(../common/symbian/symbian-mmp.conf)
diff --git a/mkspecs/symbian-sbsv2/qmake.conf b/mkspecs/symbian-sbsv2/qmake.conf
index 0a5e878..f6cf58c 100644
--- a/mkspecs/symbian-sbsv2/qmake.conf
+++ b/mkspecs/symbian-sbsv2/qmake.conf
@@ -6,4 +6,4 @@
 
 MAKEFILE_GENERATOR  = SYMBIAN_SBSV2
 
-include(../common/symbian/symbian.conf)
+include(../common/symbian/symbian-mmp.conf)
diff --git a/mkspecs/symbian/linux-armcc/features/default_post.prf b/mkspecs/symbian/linux-armcc/features/default_post.prf
new file mode 100644
index 0000000..7aa1f4d
--- /dev/null
+++ b/mkspecs/symbian/linux-armcc/features/default_post.prf
@@ -0,0 +1,5 @@
+load(default_post.prf)
+
+# It is important that this config be executed last,
+# and qmake does them in reverse order.
+CONFIG = symbian_building $$CONFIG
diff --git a/mkspecs/symbian/linux-armcc/features/qt.prf b/mkspecs/symbian/linux-armcc/features/qt.prf
index 83c4f30..04371f9 100644
--- a/mkspecs/symbian/linux-armcc/features/qt.prf
+++ b/mkspecs/symbian/linux-armcc/features/qt.prf
@@ -1,129 +1,8 @@
-load(qt)
-
-isEmpty(DESTDIR) {
-    DESTDIR = .
-}
-
-for(libraries, LIBS) {
-    isFullName = $$find(libraries, \.)
-    isEmpty(isFullName) {
-        newLIBS += "$${libraries}.dso"
-    } else {
-        newLIBS += "$${libraries}"
-    }
-}
-LIBS = $$newLIBS
-newLIBS =
-for(libraries, QMAKE_LIBS) {
-    isFullName = $$find(libraries, \.)
-    isEmpty(isFullName) {
-        newLIBS += "$${libraries}.dso"
-    } else {
-        newLIBS += "$${libraries}"
-    }
-}
-QMAKE_LIBS = $$newLIBS
-
-# This needs to be done after the above LIBS mangling.
-include(../platformlibs.conf)
-
-elf2e32_LIBPATH =
-for(libPath, QMAKE_LIBDIR) {
-    elf2e32_LIBPATH += "--libpath=$$libPath"
-}
-
-# Check for version validity.
-!isEmpty(VERSION):!contains(VERSION, "[0-9]+"):!contains(VERSION, "[0-9]+\.[0-9]+")!contains(VERSION, "[0-9]+(\.[0-9]+){2}") {
-    error("Invalid VERSION for Symbian: $$VERSION")
-}
-
-splitVersion = $$split(VERSION, ".")
-# Default Symbian version if none is specified.
-isEmpty(splitVersion):splitVersion = 10
-hexVersion = "00"
-versionPart = 1
-versionPart1 = 10
-versionPart2 = 0
-versionPart3 = 0
-for(verNumber, splitVersion) {
-    # Poor man's printf
-    hexVersion = $$hexVersion$$system("sh -c 'printf %02x $$verNumber'")
-    contains(versionPart, 3) {
-        versionPart3 = $$verNumber
-        versionPart = 4
-    }
-    contains(versionPart, 2) {
-        versionPart2 = $$verNumber
-        versionPart = 3
-    }
-    contains(versionPart, 1) {
-        versionPart1 = $$verNumber
-        versionPart = 2
-    }
-}
-!contains(hexVersion, "[0-9a-z]{8}"):hexVersion = "$${hexVersion}00"
-!contains(hexVersion, "[0-9a-z]{8}"):hexVersion = "$${hexVersion}00"
-decVersion = $$sprintf("%1.%2", $$versionPart1, $$system("sh -c 'echo \$[$$versionPart2 * 256 + $$versionPart3]'"))
-
-intUid3 = $$lower($$replace(TARGET.UID3, "^0x", ""))
-isEmpty(TARGET.SID):TARGET.SID = $$TARGET.UID3
-isEmpty(TARGET.UID2):TARGET.UID2 = 0x00000000
-
-contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) {
-    !isEmpty($$QMAKE_POST_LINK):QMAKE_POST_LINK += &&
-    QMAKE_POST_LINK += $$QMAKE_MOVE $$DESTDIR/$${TARGET}.dll $$DESTDIR/$${TARGET}.sym
-    QMAKE_POST_LINK += && elf2e32  --version=$$decVersion --sid=$$TARGET.SID  --uid1=0x10000079 --uid2=$$TARGET.UID2 --uid3=$$TARGET.UID3 --dlldata --heap=0x00020000,0x00800000 --stack=0x00014000 --capability=None --fpu=softvfp --targettype=DLL --elfinput=$${DESTDIR}/$${TARGET}.sym --output=$${DESTDIR}/$${TARGET}.dll --dso=$$DESTDIR/$${TARGET}.dso --defoutput=$$OBJECTS_DIR/$${TARGET}.def --unfrozen --linkas=$${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].dll --compressionmethod bytepair $$elf2e32_LIBPATH --unpaged
-    QMAKE_DISTCLEAN += $${DESTDIR}/$${TARGET}.sym
-    QMAKE_DISTCLEAN += $${DESTDIR}/$${TARGET}.dso
-    QMAKE_CLEAN += $${OBJECTS_DIR}/$${TARGET}.def
+QMAKE_LIBDIR_QT += $${EPOCROOT}epoc32/release/armv5/lib
+QMAKE_LIBDIR_QT *= $$(RVCT22LIB)
 
-    QMAKE_LIBS += -ledllstub.lib -ledll.lib\\(uc_dll_.o\\)
+INCLUDEPATH *= $${EPOCROOT}epoc32/include $${EPOCROOT}epoc32/include/rvct2_2 $${EPOCROOT}epoc32/include/variant $${EPOCROOT}epoc32/include/stdapis $${EPOCROOT}epoc32/include/stdapis/stlport
 
-    QMAKE_LFLAGS += --symver_soname --soname $${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].dll
-}
+DEFINES *= __PRODUCT_INCLUDE__=$${EPOCROOT}epoc32/include/variant/symbian_os.hrh
 
-contains(TEMPLATE, app) {
-    !isEmpty($$QMAKE_POST_LINK):QMAKE_POST_LINK += &&
-
-    QMAKE_POST_LINK += $$QMAKE_MOVE $$DESTDIR/$${TARGET} $$DESTDIR/$${TARGET}.sym
-    QMAKE_POST_LINK += && elf2e32  --version $$decVersion --sid=$$TARGET.SID  --uid1=0x1000007a --uid2=$$TARGET.UID2 --uid3=$$TARGET.UID3 --dlldata --heap=0x00020000,0x00800000 --stack=0x00014000 --capability=None --fpu=softvfp --targettype=EXE --elfinput=$${DESTDIR}/$${TARGET}.sym --output=$${DESTDIR}/$${TARGET}.exe --unfrozen --linkas=$${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].exe --compressionmethod bytepair $$elf2e32_LIBPATH --unpaged
-    QMAKE_DISTCLEAN += $${DESTDIR}/$${TARGET}.exe
-
-    QMAKE_LIBS += -leexe.lib\\(uc_exe_.o\\)
-
-    QMAKE_LFLAGS += --symver_soname --soname $${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].exe
-}
-
-# Symbian resource files
-
-linux-armcc:symbian_resources_INCLUDES = -I$$(RVCT22INC)
-symbian_resources_INCLUDES = $$replace(symbian_resources_INCLUDES, ",", " -I")
-symbian_resources_INCLUDES += $$join(INCLUDEPATH, " -I", "-I")
-symbian_resources_DEFINES = $$join(DEFINES, " -D", "-D")
-symbian_resources_RCC_DIR = $$replace(RCC_DIR, "/$", "")
-symbian_resources_INCLUDES += "-I $$symbian_resources_RCC_DIR"
-
-for(symbian_resource, SYMBIAN_RESOURCES) {
-    symbian_resource = $$basename(symbian_resource)
-    symbian_resource_clean = $$replace(symbian_resource, "\.rss$", ".rsc")
-    QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${symbian_resource_clean}
-    symbian_resource_clean = $$replace(symbian_resource, "\.rss$", ".rpp")
-    QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${symbian_resource_clean}
-}
-
-symbianresources.input = SYMBIAN_RESOURCES
-symbianresources.output = $$symbian_resources_RCC_DIR/${QMAKE_FILE_BASE}.rsg
-symbianresources.commands = cpp -nostdinc -undef \
-                            $$symbian_resources_INCLUDES \
-                            $$symbian_resources_DEFINES \
-                            ${QMAKE_FILE_NAME} \
-                            -o $${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}.rpp \
-                            && rcomp -u -m045,046,047 \
-                            -s$${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}.rpp \
-                            -o$${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}.rsc \
-                            -h$${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}.rsg \
-                            -i${QMAKE_FILE_NAME}
-symbianresources.dependency_type = TYPE_C
-symbianresources.CONFIG = no_link
-
-QMAKE_EXTRA_COMPILERS += symbianresources
+load(qt)
diff --git a/mkspecs/symbian/linux-armcc/features/symbian_building.prf b/mkspecs/symbian/linux-armcc/features/symbian_building.prf
new file mode 100644
index 0000000..8a0d121
--- /dev/null
+++ b/mkspecs/symbian/linux-armcc/features/symbian_building.prf
@@ -0,0 +1,132 @@
+QMAKE_CFLAGS += $$QMAKE_CFLAGS.ARMCC
+QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS.ARMCC
+
+isEmpty(DESTDIR) {
+    DESTDIR = .
+}
+
+for(libraries, LIBS) {
+    libraries = $$replace(libraries, "\.dll$", ".dso")
+    isFullName = $$find(libraries, \.)
+    isEmpty(isFullName) {
+        newLIBS += "$${libraries}.dso"
+    } else {
+        newLIBS += "$${libraries}"
+    }
+}
+LIBS = $$newLIBS
+newLIBS =
+for(libraries, QMAKE_LIBS) {
+    libraries = $$replace(libraries, "\.dll$", ".dso")
+    isFullName = $$find(libraries, \.)
+    isEmpty(isFullName) {
+        newLIBS += "$${libraries}.dso"
+    } else {
+        newLIBS += "$${libraries}"
+    }
+}
+QMAKE_LIBS = $$newLIBS
+
+# This needs to be done after the above LIBS mangling.
+include(../platformlibs.conf)
+
+elf2e32_LIBPATH =
+for(libPath, QMAKE_LIBDIR) {
+    elf2e32_LIBPATH += "--libpath=$$libPath"
+}
+
+# Check for version validity.
+!isEmpty(VERSION):!contains(VERSION, "[0-9]+"):!contains(VERSION, "[0-9]+\.[0-9]+")!contains(VERSION, "[0-9]+(\.[0-9]+){2}") {
+    error("Invalid VERSION for Symbian: $$VERSION")
+}
+
+splitVersion = $$split(VERSION, ".")
+# Default Symbian version if none is specified.
+isEmpty(splitVersion):splitVersion = 10
+hexVersion = "00"
+versionPart = 1
+versionPart1 = 10
+versionPart2 = 0
+versionPart3 = 0
+for(verNumber, splitVersion) {
+    # Poor man's printf
+    hexVersion = $$hexVersion$$system("sh -c 'printf %02x $$verNumber'")
+    contains(versionPart, 3) {
+        versionPart3 = $$verNumber
+        versionPart = 4
+    }
+    contains(versionPart, 2) {
+        versionPart2 = $$verNumber
+        versionPart = 3
+    }
+    contains(versionPart, 1) {
+        versionPart1 = $$verNumber
+        versionPart = 2
+    }
+}
+!contains(hexVersion, "[0-9a-z]{8}"):hexVersion = "$${hexVersion}00"
+!contains(hexVersion, "[0-9a-z]{8}"):hexVersion = "$${hexVersion}00"
+decVersion = $$sprintf("%1.%2", $$versionPart1, $$system("sh -c 'echo \$[$$versionPart2 * 256 + $$versionPart3]'"))
+
+intUid3 = $$lower($$replace(TARGET.UID3, "^0x", ""))
+isEmpty(TARGET.SID):TARGET.SID = $$TARGET.UID3
+isEmpty(TARGET.UID2):TARGET.UID2 = 0x00000000
+
+contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) {
+    !isEmpty($$QMAKE_POST_LINK):QMAKE_POST_LINK += &&
+    QMAKE_POST_LINK += $$QMAKE_MOVE $$DESTDIR/$${TARGET}.dll $$DESTDIR/$${TARGET}.sym
+    QMAKE_POST_LINK += && elf2e32  --version=$$decVersion --sid=$$TARGET.SID  --uid1=0x10000079 --uid2=$$TARGET.UID2 --uid3=$$TARGET.UID3 --dlldata --heap=0x00020000,0x00800000 --stack=0x00014000 --capability=None --fpu=softvfp --targettype=DLL --elfinput=$${DESTDIR}/$${TARGET}.sym --output=$${DESTDIR}/$${TARGET}.dll --dso=$$DESTDIR/$${TARGET}.dso --defoutput=$$OBJECTS_DIR/$${TARGET}.def --unfrozen --linkas=$${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].dll --compressionmethod bytepair $$elf2e32_LIBPATH --unpaged
+    QMAKE_DISTCLEAN += $${DESTDIR}/$${TARGET}.sym
+    QMAKE_DISTCLEAN += $${DESTDIR}/$${TARGET}.dso
+    QMAKE_CLEAN += $${OBJECTS_DIR}/$${TARGET}.def
+
+    QMAKE_LIBS += -ledllstub.lib -ledll.lib\\(uc_dll_.o\\)
+
+    QMAKE_LFLAGS += --symver_soname --soname $${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].dll
+}
+
+contains(TEMPLATE, app) {
+    !isEmpty($$QMAKE_POST_LINK):QMAKE_POST_LINK += &&
+
+    QMAKE_POST_LINK += $$QMAKE_MOVE $$DESTDIR/$${TARGET} $$DESTDIR/$${TARGET}.sym
+    QMAKE_POST_LINK += && elf2e32  --version $$decVersion --sid=$$TARGET.SID  --uid1=0x1000007a --uid2=$$TARGET.UID2 --uid3=$$TARGET.UID3 --dlldata --heap=0x00020000,0x00800000 --stack=0x00014000 --capability=None --fpu=softvfp --targettype=EXE --elfinput=$${DESTDIR}/$${TARGET}.sym --output=$${DESTDIR}/$${TARGET}.exe --unfrozen --linkas=$${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].exe --compressionmethod bytepair $$elf2e32_LIBPATH --unpaged
+    QMAKE_DISTCLEAN += $${DESTDIR}/$${TARGET}.exe
+
+    QMAKE_LIBS += -leexe.lib\\(uc_exe_.o\\)
+
+    QMAKE_LFLAGS += --symver_soname --soname $${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].exe
+}
+
+# Symbian resource files
+
+linux-armcc:symbian_resources_INCLUDES = -I$$(RVCT22INC)
+symbian_resources_INCLUDES = $$replace(symbian_resources_INCLUDES, ",", " -I")
+symbian_resources_INCLUDES += $$join(INCLUDEPATH, " -I", "-I")
+symbian_resources_DEFINES = $$join(DEFINES, " -D", "-D")
+symbian_resources_RCC_DIR = $$replace(RCC_DIR, "/$", "")
+symbian_resources_INCLUDES += "-I $$symbian_resources_RCC_DIR"
+
+for(symbian_resource, SYMBIAN_RESOURCES) {
+    symbian_resource = $$basename(symbian_resource)
+    symbian_resource_clean = $$replace(symbian_resource, "\.rss$", ".rsc")
+    QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${symbian_resource_clean}
+    symbian_resource_clean = $$replace(symbian_resource, "\.rss$", ".rpp")
+    QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${symbian_resource_clean}
+}
+
+symbianresources.input = SYMBIAN_RESOURCES
+symbianresources.output = $$symbian_resources_RCC_DIR/${QMAKE_FILE_BASE}.rsg
+symbianresources.commands = cpp -nostdinc -undef \
+                            $$symbian_resources_INCLUDES \
+                            $$symbian_resources_DEFINES \
+                            ${QMAKE_FILE_NAME} \
+                            -o $${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}.rpp \
+                            && rcomp -u -m045,046,047 \
+                            -s$${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}.rpp \
+                            -o$${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}.rsc \
+                            -h$${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}.rsg \
+                            -i${QMAKE_FILE_NAME}
+symbianresources.dependency_type = TYPE_C
+symbianresources.CONFIG = no_link
+
+QMAKE_EXTRA_COMPILERS += symbianresources
diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf
index be59baf..c98c1f0 100644
--- a/mkspecs/symbian/linux-armcc/qmake.conf
+++ b/mkspecs/symbian/linux-armcc/qmake.conf
@@ -2,53 +2,6 @@
 # qmake configuration for symbian/linux-armcc
 #
 
-MAKEFILE_GENERATOR	= UNIX
-TEMPLATE		= app
-CONFIG			+= qt warn_on release incremental link_prl rvct_linker
-QT			+= core gui
-QMAKE_INCREMENTAL_STYLE = sublib
+include(../../common/symbian/symbian-makefile.conf)
 
 include(../../common/armcc.conf)
-load(qt_config)
-
-QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc
-QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic
-
-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_CHK_DIR_EXISTS  = test -d
-QMAKE_MKDIR           = mkdir -p
-
-QMAKE_CFLAGS		+= --dllimport_runtime --preinclude rvct2_2.h  --diag_suppress 186,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --export_all_vtbl --no_vfe --apcs /inter --visibility_inlines_hidden
-QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS --no_parse_templates
-QMAKE_LFLAGS      	+= --diag_suppress 6331,6780 --bpabi --reloc --datacompressor=off --split --rw-base 0x800000 --dll --no_scanlib
-QMAKE_LFLAGS_APP        += --entry _E32Startup
-QMAKE_LFLAGS_SHLIB      += --entry _E32Dll
-
-QT_ARCH               = symbian
-
-DEFINES              += __SYMBIAN32__ EKA2 __S60_50__ __S60_3X__ __SERIES60_3X__ __EPOC32__ __MARM__ __EABI__ __ARMCC__ __ARMcc_2__ __ARMCC_2_2__ __MARM_ARMV5__ __MARM_THUMB__ __MARM_INTERWORK__ __DLL__ _UNICODE __SUPPORT_CPP_EXCEPTIONS__
-
-INCLUDEPATH += $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off
-
-# ### FIXME Move these to proper locations.
-QMAKE_LIBS           += -llibc -llibm -leuser -llibdl -llibpthread -lefsrv -llibstdcpp -lplatformenv
-QMAKE_LIBS_GUI       += -lfbscli -lbitgdi -lhal -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc
-QMAKE_LIBS_S60       += -lavkon
-
-include(../../common/unix.conf)
-
-QMAKE_PREFIX_SHLIB    =
-QMAKE_EXTENSION_SHLIB = dll
-QMAKE_PREFIX_STATICLIB =
-QMAKE_EXTENSION_STATICLIB = lib
-QMAKE_SYMBIAN_SHLIB   = 1
-
-include(symbian.conf)
diff --git a/mkspecs/symbian/linux-armcc/symbian.conf b/mkspecs/symbian/linux-armcc/symbian.conf
deleted file mode 100644
index 8b1dbea..0000000
--- a/mkspecs/symbian/linux-armcc/symbian.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# ALL OF THIS SHOULD BE MOVED TO mkspecs/common.
-
-QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]