Merge remote-tracking branch 'origin/master' into lighthouse-master

10 files changed, 199 insertions, 128 deletions

diff --git a/mkspecs/features/link_pkgconfig.prf b/mkspecs/features/link_pkgconfig.prf
index d70e5de..a3dbd1f 100644
--- a/mkspecs/features/link_pkgconfig.prf
+++ b/mkspecs/features/link_pkgconfig.prf
@@ -1,7 +1,12 @@
 # handle pkg-config files
-isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config
+isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config # keep consistent with qt_functions.prf too!
+
 for(PKGCONFIG_LIB, $$list($$unique(PKGCONFIG))) {
+    # don't proceed if the .pro asks for a package we don't have!
+    !packagesExist($$PKGCONFIG_LIB):error("Package $$PKGCONFIG_LIB not found")
+
     QMAKE_CXXFLAGS += $$system($$PKG_CONFIG --cflags $$PKGCONFIG_LIB)
     QMAKE_CFLAGS += $$system($$PKG_CONFIG --cflags $$PKGCONFIG_LIB)
     LIBS += $$system($$PKG_CONFIG --libs $$PKGCONFIG_LIB)
 }
+
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index 4999762..273094d 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
@@ -7,7 +7,7 @@ load(default_post)
 # PowerPC-based systems. Note that this logic assumes that Qt has been 
 # configured with an architecture that is usable on the system.
 qt:!isEmpty(QT_CONFIG) {
-    contains(QMAKE_HOST.arch, ppc) {
+    contains(QMAKE_HOST.arch, ppc)|contains(QMAKE_HOST.arch, "Power Macintosh") {
         !contains(QT_CONFIG, ppc64):contains(QT_CONFIG, ppc):CONFIG += ppc
         contains(QT_CONFIG, ppc64):!contains(QT_CONFIG, ppc):CONFIG += ppc64
     } else {
diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf
index 19e01a1..de1cac4 100644
--- a/mkspecs/features/qt_config.prf
+++ b/mkspecs/features/qt_config.prf
@@ -11,7 +11,11 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) {
    debug(1, "Cannot load qconfig.pri!")
 } else {
    debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)")
-   for(mod, $$list($$files($$dirname(QMAKE_QT_CONFIG)/modules/qt_*.pri))):include($$mod)
+   for(dir, $$list($$unique($$list($$dirname(QMAKE_QT_CONFIG) \
+                                   $$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR))))) {
+      debug(1, "Loading modules from $${dir}")
+      for(mod, $$list($$files($$dir/modules/qt_*.pri))):include($$mod)
+   }
 }
 
 load(qt_functions)
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 964e13b..5baf7ce 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -46,22 +46,27 @@ defineTest(qtAddLibrary) {
        }
     }
     symbian {
-        isEqual(LIB_NAME, QtGui) {
+        isEqual(LIB_NAME, QtCore) {
+            #workaround for dependency from f32file.h on e32svr.h which has moved location in symbian3
+            contains(SYMBIAN_VERSION, Symbian3) {
+                INCLUDEPATH *= $$OS_LAYER_SYSTEMINCLUDE
+            }
+        } else:isEqual(LIB_NAME, QtGui) {
             # Needed for #include <QtGui> because qs60mainapplication.h includes aknapp.h
             INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
         } else:isEqual(LIB_NAME, QtWebKit) {
             # Needed for because relative inclusion problem in toolchain
             INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtXmlPatterns
             INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtNetwork
-            TARGET.CAPABILITY *= NetworkServices
+            isEmpty(TARGET.CAPABILITY): TARGET.CAPABILITY = NetworkServices
             isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
         } else:isEqual(LIB_NAME, QtXmlPatterns) {
             # Needed for #include <QtXmlPatterns/QtXmlPatterns> because relative inclusion problem in toolchain
             INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtNetwork
         } else:isEqual(LIB_NAME, QtNetwork) {
-            TARGET.CAPABILITY *= NetworkServices
+            isEmpty(TARGET.CAPABILITY): TARGET.CAPABILITY = NetworkServices
         } else:isEqual(LIB_NAME, QtDeclarative) {
-            TARGET.CAPABILITY *= NetworkServices
+            isEmpty(TARGET.CAPABILITY): TARGET.CAPABILITY = NetworkServices
             isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
         }
         export(TARGET.EPOCHEAPSIZE)
@@ -103,3 +108,17 @@ defineTest(qtPrepareTool) {
     }
     export($$1)
 }
+
+defineTest(packagesExist) {
+    # this can't be done in global scope here because qt_functions is loaded
+    # before the .pro is parsed, so if the .pro set PKG_CONFIG, we wouldn't know it
+    # yet. oops.
+    isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config # keep consistent with link_pkgconfig.prf! too
+
+    for(package, ARGS) {
+        !system($$PKG_CONFIG --exists $$package):return(false)
+    }
+
+    return(true)
+}
+
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf
index f50e944..d9918bf 100644
--- a/mkspecs/features/symbian/application_icon.prf
+++ b/mkspecs/features/symbian/application_icon.prf
@@ -12,69 +12,75 @@ contains(CONFIG, no_icon) {
 
 !contains(CONFIG, no_icon) {
     baseTarget = $$symbianRemoveSpecialCharacters($$basename(TARGET))
-    symbian-abld|symbian-sbsv2 {
-        resourceZDir = $$EPOCROOT$$HW_ZDIR$$APP_RESOURCE_DIR
-        regZDir = $$EPOCROOT$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR
+    contains(baseTarget, "^.*\\..*$") {
+        CONFIG += no_icon
+        ICON =
+        warning("Symbian resources do not support '.' character in TARGET, skipping resource generation.")
     } else {
-        contains(DESTDIR, "/.*") {
-            resourceZDir = $$DESTDIR
-        } else:isEmpty(DESTDIR) {
-            resourceZDir = $$OUT_PWD
+        symbian-abld|symbian-sbsv2 {
+            resourceZDir = $$EPOCROOT$$HW_ZDIR$$APP_RESOURCE_DIR
+            regZDir = $$EPOCROOT$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR
         } else {
-            resourceZDir = $$OUT_PWD/$$DESTDIR
+            contains(DESTDIR, "/.*") {
+                resourceZDir = $$DESTDIR
+            } else:isEmpty(DESTDIR) {
+                resourceZDir = $$OUT_PWD
+            } else {
+                resourceZDir = $$OUT_PWD/$$DESTDIR
+            }
+            regZDir = $$resourceZDir
         }
-        regZDir = $$resourceZDir
-    }
 
-    default_resource_deployment.files += $$resourceZDir/$${baseTarget}.rsc
-    default_resource_deployment.path = $$APP_RESOURCE_DIR
-    default_reg_deployment.files += $$regZDir/$${baseTarget}_reg.rsc
-    default_reg_deployment.path = $$REG_RESOURCE_IMPORT_DIR
+        default_resource_deployment.files += $$resourceZDir/$${baseTarget}.rsc
+        default_resource_deployment.path = $$APP_RESOURCE_DIR
+        default_reg_deployment.files += $$regZDir/$${baseTarget}_reg.rsc
+        default_reg_deployment.path = $$REG_RESOURCE_IMPORT_DIR
 
-    !isEmpty(ICON) {
-        !count(ICON, 1) {
-            ICON = $$first(ICON)
-            warning("Only first icon specified in ICON variable is used: $$ICON")
-        }
+        !isEmpty(ICON) {
+            !count(ICON, 1) {
+                ICON = $$first(ICON)
+                warning("Only first icon specified in ICON variable is used: $$ICON")
+            }
 
-        # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code
-        !symbian-sbsv2 {
-            # Absolute path required for shadow builds.
-            # However, in older Symbian environments abld toolchain can't handle even moderately long
-            # paths, so don't force absolute there.
-            !symbian-abld:!contains(ICON, "^(/|\\\\|.:).*"):ICON = $$_PRO_FILE_PWD_/$$ICON
+            # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code
+            !symbian-sbsv2 {
+                # Absolute path required for shadow builds.
+                # However, in older Symbian environments abld toolchain can't handle even moderately long
+                # paths, so don't force absolute there.
+                !symbian-abld:!contains(ICON, "^(/|\\\\|.:).*"):ICON = $$_PRO_FILE_PWD_/$$ICON
 
-            #Makefile: requires paths with backslash
-            ICON_backslashed = $$ICON
+                #Makefile: requires paths with backslash
+                ICON_backslashed = $$ICON
 
-            symbian-abld {
-                # ${ZDIR} is defined in Makefile
-                mifIconZDir = ${ZDIR}$$APP_RESOURCE_DIR
-            } else {
-                mifIconZDir = $$resourceZDir
-            }
+                symbian-abld {
+                    # ${ZDIR} is defined in Makefile
+                    mifIconZDir = ${ZDIR}$$APP_RESOURCE_DIR
+                } else {
+                    mifIconZDir = $$resourceZDir
+                }
 
-            # Extra compiler rules for mifconv
-            mifconv.target = $$mifIconZDir/$${baseTarget}.mif
-            contains(QMAKE_HOST.os, "Windows") {
-                ICON_backslashed = $$replace(ICON_backslashed, /, \\)
-                mifconv.target = $$replace(mifconv.target, /, \\)
-            }
-            # Based on: http://www.forum.nokia.com/document/Cpp_Developers_Library
-            # svg-t icons should always use /c32 depth
-            mifconv.commands = mifconv $$mifconv.target /c32 $$ICON_backslashed
+                # Extra compiler rules for mifconv
+                mifconv.target = $$mifIconZDir/$${baseTarget}.mif
+                contains(QMAKE_HOST.os, "Windows") {
+                    ICON_backslashed = $$replace(ICON_backslashed, /, \\)
+                    mifconv.target = $$replace(mifconv.target, /, \\)
+                }
+                # Based on: http://www.forum.nokia.com/document/Cpp_Developers_Library
+                # svg-t icons should always use /c32 depth
+                mifconv.commands = mifconv $$mifconv.target /c32 $$ICON_backslashed
 
-            mifconv.depends = $$ICON
-            PRE_TARGETDEPS += $$mifconv.target
-            QMAKE_EXTRA_TARGETS += mifconv
-            QMAKE_DISTCLEAN += $$mifconv.target
-        }
-        # Rules to use generated MIF file from symbian resources
-        RSS_RULES.number_of_icons = $$size(ICON_backslashed)
+                mifconv.depends = $$ICON
+                PRE_TARGETDEPS += $$mifconv.target
+                QMAKE_EXTRA_TARGETS += mifconv
+                QMAKE_CLEAN += $$mifconv.target
+            }
+            # Rules to use generated MIF file from symbian resources
+            RSS_RULES.number_of_icons = $$size(ICON_backslashed)
 
-        RSS_RULES.icon_file = $$APP_RESOURCE_DIR/$${baseTarget}.mif                
+            RSS_RULES.icon_file = $$APP_RESOURCE_DIR/$${baseTarget}.mif                
 
-        default_resource_deployment.files += $$resourceZDir/$${baseTarget}.mif
+            default_resource_deployment.files += $$resourceZDir/$${baseTarget}.mif
+        }
     }
 }
 
diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf
index fffc481..98ab547 100644
--- a/mkspecs/features/symbian/default_post.prf
+++ b/mkspecs/features/symbian/default_post.prf
@@ -85,14 +85,16 @@ contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0
 isEmpty(TARGET.EPOCSTACKSIZE):TARGET.EPOCSTACKSIZE = 0x14000
 isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x020000 0x800000
 
-# Supports S60 3.1, 3.2, 5.0, Symbian^3, and Symbian^4 by default
+# Supports Symbian^3 and Symbian^4 by default and also S60 3.1, 3.2, and 5.0 if built against any of those.
 platform_product_id = S60ProductID
 platform_product_id = $$addLanguageDependentPkgItem(platform_product_id)
 pkg_platform_dependencies = \
     "; Default HW/platform dependencies" \
-    "[0x102032BE],0,0,0,{$$platform_product_id}" \
-    "[0x102752AE],0,0,0,{$$platform_product_id}" \
-    "[0x1028315F],0,0,0,{$$platform_product_id}" \
     "[0x20022E6D],0,0,0,{$$platform_product_id}" \
-    "[0x20032DE7],0,0,0,{$$platform_product_id}" \
-    " "
+    "[0x20032DE7],0,0,0,{$$platform_product_id}"
+contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+    pkg_platform_dependencies += \
+        "[0x102032BE],0,0,0,{$$platform_product_id}" \
+        "[0x102752AE],0,0,0,{$$platform_product_id}" \
+        "[0x1028315F],0,0,0,{$$platform_product_id}"
+}
diff --git a/mkspecs/features/symbian/sis_targets.prf b/mkspecs/features/symbian/sis_targets.prf
index d94693d..d6d6df0 100644
--- a/mkspecs/features/symbian/sis_targets.prf
+++ b/mkspecs/features/symbian/sis_targets.prf
@@ -24,6 +24,7 @@ equals(GENERATE_SIS_TARGETS, true) {
     stub_pkg_target.commands = $(MAKE) -f $(MAKEFILE) qmake
     QMAKE_EXTRA_TARGETS += template_pkg_target installer_pkg_target stub_pkg_target
 
+    qtPrepareTool(QMAKE_CREATEPACKAGE, createpackage)
 
     symbian-abld|symbian-sbsv2 {
         symbian-sbsv2 {
@@ -47,7 +48,7 @@ equals(GENERATE_SIS_TARGETS, true) {
         sis_target.depends += $${baseTarget}_template.pkg
 
         ok_sis_target.target = ok_sis
-        ok_sis_target.commands = createpackage $$CONVERT_GCCE_PARAM $(QT_SIS_OPTIONS) $${baseTarget}_template.pkg \
+        ok_sis_target.commands = $$QMAKE_CREATEPACKAGE $$CONVERT_GCCE_PARAM $(QT_SIS_OPTIONS) $${baseTarget}_template.pkg \
                                      $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
 
         unsigned_sis_target.target = unsigned_sis
@@ -64,7 +65,7 @@ equals(GENERATE_SIS_TARGETS, true) {
         unsigned_sis_target.depends += $${baseTarget}_template.pkg
 
         ok_unsigned_sis_target.target = ok_unsigned_sis
-        ok_unsigned_sis_target.commands = createpackage $$CONVERT_GCCE_PARAM $(QT_SIS_OPTIONS) -o $${baseTarget}_template.pkg $(QT_SIS_TARGET)
+        ok_unsigned_sis_target.commands = $$QMAKE_CREATEPACKAGE $$CONVERT_GCCE_PARAM $(QT_SIS_OPTIONS) -o $${baseTarget}_template.pkg $(QT_SIS_TARGET)
 
         target_sis_target.target = $${baseTarget}.sis
         target_sis_target.commands = $(MAKE) -f $(MAKEFILE) sis
@@ -76,7 +77,7 @@ equals(GENERATE_SIS_TARGETS, true) {
         installer_sis_target.depends = $${baseTarget}_installer.pkg sis
 
         ok_installer_sis_target.target = ok_installer_sis
-        ok_installer_sis_target.commands = createpackage $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \
+        ok_installer_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \
                                                $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
         ok_installer_sis_target.depends = $${baseTarget}_installer.pkg
 
@@ -85,7 +86,7 @@ equals(GENERATE_SIS_TARGETS, true) {
         unsigned_installer_sis_target.depends = $${baseTarget}_installer.pkg unsigned_sis
 
         ok_unsigned_installer_sis_target.target = ok_unsigned_installer_sis
-        ok_unsigned_installer_sis_target.commands = createpackage $(QT_SIS_OPTIONS) -o $${baseTarget}_installer.pkg
+        ok_unsigned_installer_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) -o $${baseTarget}_installer.pkg
         ok_unsigned_installer_sis_target.depends = $${baseTarget}_installer.pkg
 
         fail_sis_nocache_target.target = fail_sis_nocache
@@ -105,7 +106,7 @@ equals(GENERATE_SIS_TARGETS, true) {
         stub_sis_target.depends += $${baseTarget}_stub.pkg
 
         ok_stub_sis_target.target = ok_stub_sis
-        ok_stub_sis_target.commands = createpackage -s $(QT_SIS_OPTIONS) $${baseTarget}_stub.pkg \
+        ok_stub_sis_target.commands = $$QMAKE_CREATEPACKAGE -s $(QT_SIS_OPTIONS) $${baseTarget}_stub.pkg \
                                           $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
 
         QMAKE_EXTRA_TARGETS += sis_target \
@@ -143,8 +144,6 @@ equals(GENERATE_SIS_TARGETS, true) {
             QMAKE_EXTRA_TARGETS += store_build_target
         }
     } else {
-        qtPrepareTool(QMAKE_CREATEPACKAGE, createpackage)
-
         sis_destdir = $$DESTDIR
         isEmpty(sis_destdir):sis_destdir = .
         !equals(TARGET, "$$baseTarget"):sis_destdir = $$sis_destdir/$$dirname(TARGET)
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index 9288583..28046b4 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
@@ -51,7 +56,7 @@ defineReplace(processSymbianLibrary) {
 }
 
 # This part turn "-llibc" into "libc.dso", and moves -L entries to QMAKE_LIBDIR.
-libsToProcess = LIBS QMAKE_LIBS
+libsToProcess = LIBS LIBS_PRIVATE QMAKE_LIBS
 for(libToProcess, libsToProcess) {
     qt_libraries = $$split($$libToProcess, " ")
     eval($$libToProcess =)
@@ -90,8 +95,8 @@ count(splitVersion, 0) {
 } else {
     count(splitVersion, 3) {
         hexVersion = $$system("perl -e \"printf (\\\"%02x\\\", $$member(splitVersion, 0))\"")
-        hexPart2 = $$system("perl -e \"printf (\\\"%02x\\\", $$member(splitVersion, 1))\"")"
-        hexPart2 = $$hexPart2$$system("perl -e \"printf (\\\"%02x\\\", $$member(splitVersion, 2))\"")"
+        hexPart2 = $$system("perl -e \"printf (\\\"%02x\\\", $$member(splitVersion, 1))\"")
+        hexPart2 = $$hexPart2$$system("perl -e \"printf (\\\"%02x\\\", $$member(splitVersion, 2))\"")
         decVersion = $$system("perl -e \"printf (\\\"%1d\\\", 0x$$hexVersion)\"").
         hexVersion = $$hexVersion$$hexPart2
         decVersion = $$decVersion$$system("perl -e \"printf (\\\"%d\\\", 0x$$hexPart2)\"")
@@ -235,13 +240,9 @@ 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, "/$", "")
 symbian_resources_INCLUDES += "-I$$symbian_resources_RCC_DIR"
 
@@ -256,6 +257,7 @@ for(symbian_resource, SYMBIAN_RESOURCES) {
 symbianresources.input = SYMBIAN_RESOURCES
 symbianresources.output = $$symbian_resources_RCC_DIR/${QMAKE_FILE_BASE}$${QT_LIBINFIX}.rsg
 symbianresources.commands = cpp -nostdinc -undef \
+                            -include $$QMAKE_SYMBIAN_INCLUDES \
                             $$symbian_resources_INCLUDES \
                             $$symbian_resources_DEFINES \
                             ${QMAKE_FILE_NAME} \
@@ -271,46 +273,79 @@ symbianresources.CONFIG = no_link target_predeps
 
 QMAKE_EXTRA_COMPILERS += symbianresources
 
+# This section generates the rsg and rsc files for symbian.
 contains(TEMPLATE, "app"):!contains(CONFIG, "no_icon") {
-    # Make our own extra target in order to get dependencies for generated
-    # files right. This also avoids the warning about files not found.
-    symbianGenResource.target = $${symbian_resources_RCC_DIR}/$${baseTarget}.rsg
-    symbianGenResource.commands = cpp -nostdinc -undef \
-                                  $$symbian_resources_INCLUDES \
-                                  $$symbian_resources_DEFINES \
-                                  $${baseTarget}.rss \
-                                  > $${symbian_resources_RCC_DIR}/$${baseTarget}.rpp \
-                                  && rcomp -u -m045,046,047 \
-                                  -s$${symbian_resources_RCC_DIR}/$${baseTarget}.rpp \
-                                  -o$${symbianDestdir}/$${baseTarget}.rsc \
-                                  -h$${symbian_resources_RCC_DIR}/$${baseTarget}.rsg \
-                                  -i$${baseTarget}.rss
-    silent:symbianGenResource.commands = @echo rcomp $${baseTarget}.rss && $$symbianGenResource.commands
-    symbianGenResource.depends = $${baseTarget}.rss
-    PRE_TARGETDEPS += $${symbian_resources_RCC_DIR}/$${baseTarget}.rsg
-    QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseTarget}.rsg
-    QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseTarget}.rpp
-    QMAKE_DISTCLEAN += $${baseTarget}.rss
-    QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.rsc
-
-    symbianGenRegResource.target = $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rsg
-    symbianGenRegResource.commands = cpp -nostdinc -undef \
-                                     $$symbian_resources_INCLUDES \
-                                     $$symbian_resources_DEFINES \
-                                     $${baseTarget}_reg.rss \
-                                     > $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rpp \
-                                     && rcomp -u -m045,046,047 \
-                                     -s$${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rpp \
-                                     -o$${symbianDestdir}/$${baseTarget}_reg.rsc \
-                                     -h$${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rsg \
-                                     -i$${baseTarget}_reg.rss
-    silent:symbianGenRegResource.commands = @echo rcomp $${baseTarget}_reg.rss && $$symbianGenRegResource.commands
-    symbianGenRegResource.depends = $${baseTarget}_reg.rss $${symbian_resources_RCC_DIR}/$${baseTarget}.rsg
-    PRE_TARGETDEPS += $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rsg
-    QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rsg
-    QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rpp
-    QMAKE_DISTCLEAN += $${baseTarget}_reg.rss
-    QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}_reg.rsc
+    # Look for extra languages for the resources, and then generate a target for each one.
+    localize_deployment:symbianGenResourceLanguages = $$SYMBIAN_MATCHED_LANGUAGES default
+    else:symbianGenResourceLanguages = default
+    for(language, symbianGenResourceLanguages) {
+        # Special languages get their language number appended to the filename.
+        contains(language, default) {
+            symbianGenResource_DEFINES = $$symbian_resources_DEFINES
+            rpp = $${symbian_resources_RCC_DIR}/$${baseTarget}.rpp
+            rsc = $${symbianDestdir}/$${baseTarget}.rsc
+            rsg = $${symbian_resources_RCC_DIR}/$${baseTarget}.rsg
+        } else {
+            languageNo = $$eval(SYMBIAN_LANG.$$language)
+            symbianGenResource_DEFINES = $$symbian_resources_DEFINES -DLANGUAGE_$${languageNo}
+            rpp = $${symbian_resources_RCC_DIR}/$${baseTarget}_$${languageNo}.rpp
+            rsc = $${symbianDestdir}/$${baseTarget}.r$${languageNo}
+            rsg = $${symbian_resources_RCC_DIR}/$${baseTarget}_$${languageNo}.rsg
+        }
+
+        # Make our own extra target in order to get dependencies for generated
+        # files right. This also avoids the warning about files not found.
+        eval(symbianGenResource_$${language}.target = $$rsg)
+        eval(symbianGenResource_$${language}.commands = cpp -nostdinc -undef \
+                                      -include $$QMAKE_SYMBIAN_INCLUDES \
+                                      $$symbian_resources_INCLUDES \
+                                      $$symbianGenResource_DEFINES \
+                                      $${baseTarget}.rss \
+                                      > $$rpp \
+                                      && rcomp -u -m045,046,047 \
+                                      -s$$rpp \
+                                      -o$$rsc \
+                                      -h$$rsg \
+                                      -i$${baseTarget}.rss)
+        silent:eval(symbianGenResource_$${language}.commands = @echo rcomp $${baseTarget}.rss && $$eval(symbianGenResource_$${language}.commands))
+        eval(symbianGenResource_$${language}.depends = $${baseTarget}.rss)
+        PRE_TARGETDEPS += $$rsg
+        QMAKE_CLEAN += $$rsg $$rpp
+        QMAKE_DISTCLEAN += $$rsc
+
+        QMAKE_EXTRA_TARGETS += symbianGenResource_$${language}
+
+        # Note that we depend on the base rsg file, even if dealing with a specific language.
+        # hence we don't use $$rsg on the next line.
+        eval(symbianGenRegResource_$${language}.depends = $${baseTarget}_reg.rss $${symbian_resources_RCC_DIR}/$${baseTarget}.rsg)
+        contains(language, default) {
+            rpp = $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rpp
+            rsc = $${symbianDestdir}/$${baseTarget}_reg.rsc
+            rsg = $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rsg
+        } else {
+            rpp = $${symbian_resources_RCC_DIR}/$${baseTarget}_reg_$${languageNo}.rpp
+            rsc = $${symbianDestdir}/$${baseTarget}_reg.r$${languageNo}
+            rsg = $${symbian_resources_RCC_DIR}/$${baseTarget}_reg_$${languageNo}.rsg
+        }
+        eval(symbianGenRegResource_$${language}.target = $$rsg)
+        eval(symbianGenRegResource_$${language}.commands = cpp -nostdinc -undef \
+                                         -include $$QMAKE_SYMBIAN_INCLUDES \
+                                         $$symbian_resources_INCLUDES \
+                                         $$symbianGenResource_DEFINES \
+                                         $${baseTarget}_reg.rss \
+                                         > $$rpp \
+                                         && rcomp -u -m045,046,047 \
+                                         -s$$rpp \
+                                         -o$$rsc \
+                                         -h$$rsg \
+                                         -i$${baseTarget}_reg.rss)
+        silent:eval(symbianGenRegResource_$${language}.commands = @echo rcomp $${baseTarget}_reg.rss && $$eval(symbianGenRegResource_$${language}.commands))
+        PRE_TARGETDEPS += $$rsg
+        QMAKE_CLEAN += $$rsg $$rpp
+        QMAKE_DISTCLEAN += $$rsc
+
+        QMAKE_EXTRA_TARGETS += symbianGenRegResource_$${language}
+    }
 
     # Trick to get qmake to create the RCC_DIR for us.
     symbianRccDirCreation.input = SOURCES
@@ -318,14 +353,15 @@ contains(TEMPLATE, "app"):!contains(CONFIG, "no_icon") {
     symbianRccDirCreation.output = $${symbian_resources_RCC_DIR}/symbian_resource_dummy
     symbianRccDirCreation.CONFIG = no_link combine
 
-    QMAKE_EXTRA_TARGETS += symbianGenResource symbianGenRegResource
     QMAKE_EXTRA_COMPILERS += symbianRccDirCreation
 
-    QMAKE_DISTCLEAN += $${baseTarget}.loc
+    QMAKE_DISTCLEAN += $${baseTarget}.rss \
+                       $${baseTarget}_reg.rss \
+                       $${baseTarget}.loc
 }
 
 # Generated pkg files
 
-QMAKE_DISTCLEAN += $${baseTarget}_template.pkg
-QMAKE_DISTCLEAN += $${baseTarget}_installer.pkg
-QMAKE_DISTCLEAN += $${baseTarget}_stub.pkg
+QMAKE_DISTCLEAN += $${baseTarget}_template.pkg \
+                   $${baseTarget}_installer.pkg \
+                   $${baseTarget}_stub.pkg
diff --git a/mkspecs/features/win32/embed_manifest_dll.prf b/mkspecs/features/win32/embed_manifest_dll.prf
index e8711da..69c9d1d 100644
--- a/mkspecs/features/win32/embed_manifest_dll.prf
+++ b/mkspecs/features/win32/embed_manifest_dll.prf
@@ -1,6 +1,6 @@
-MANIFEST_DIR = $$OBJECTS_DIR
-isEmpty(MANIFEST_DIR):MANIFEST_DIR = .
 !if(plugin:no_plugin_manifest):if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!static:!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "lib") {
+    MANIFEST_DIR = $$OBJECTS_DIR
+    isEmpty(MANIFEST_DIR):MANIFEST_DIR = .
     NOPATH_TARGET = $$TARGET
     NOPATH_TARGET ~= s,\\\\ , ,q    # Remove space escaping (NOPATH_TARGET is quoted)
     NOPATH_TARGET ~= s,\\\\,/,g     # Change to single type separators
diff --git a/mkspecs/features/win32/embed_manifest_exe.prf b/mkspecs/features/win32/embed_manifest_exe.prf
index 2d1c09b..44aadfa 100644
--- a/mkspecs/features/win32/embed_manifest_exe.prf
+++ b/mkspecs/features/win32/embed_manifest_exe.prf
@@ -1,6 +1,6 @@
-MANIFEST_DIR = $$OBJECTS_DIR
-isEmpty(MANIFEST_DIR):MANIFEST_DIR = .
 if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "app") {
+    MANIFEST_DIR = $$OBJECTS_DIR
+    isEmpty(MANIFEST_DIR):MANIFEST_DIR = .
     NOPATH_TARGET = $$TARGET
     NOPATH_TARGET ~= s,\\\\ , ,q    # Remove space escaping (NOPATH_TARGET is quoted)
     NOPATH_TARGET ~= s,\\\\,/,g     # Change to single type separators