Merge remote branch 'qt/master' into lighthouse-master

Conflicts:
	src/gui/painting/qpdf.cpp

5 files changed, 79 insertions, 51 deletions

diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 679731f..cc5b788 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -132,39 +132,49 @@ exists($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf) {
 }
 
 # Try to detect SDK version if it wasn't set by environment.prf
-isEmpty(S60_VERSION) {
-    # The Symbian^3 PDK does not necessarily contain the required sis files.
-    # However, libstdcppv5 first appeared in Symbian^3 (S60 5.2), so check for that too.
-    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso) {
-        S60_VERSION = 5.2
+isEmpty(SYMBIAN_VERSION) {
+    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Symbianv4.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/Symbianv4.sis) {
+        SYMBIAN_VERSION = Symbian4
     } else {
-        exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.1.sis) {
-            S60_VERSION = 5.1
+        # The Symbian^3 PDK does not necessarily contain the required sis files.
+        # However, libstdcppv5 first appeared in Symbian^3 (S60 5.2), so check for that too.
+        exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso) {
+            SYMBIAN_VERSION = Symbian3
         } else {
-            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
+            exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.1.sis) {
+                SYMBIAN_VERSION = Symbian2
             } 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
+                exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) {
+                    SYMBIAN_VERSION = 9.4
                 } else {
-                    S60_VERSION = 3.1
+                    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) {
+                        SYMBIAN_VERSION = 9.3
+                    } else {
+                        exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.1.sis) {
+                            SYMBIAN_VERSION = 9.2
+                        } else {
+                            SYMBIAN_VERSION = Unknown
+                        }
+                    }
                 }
             }
         }
     }
 }
 
-isEmpty(SYMBIAN_VERSION) {
-    contains(S60_VERSION, "3\\.1") {
-        SYMBIAN_VERSION = 9.2
-    } else:contains(S60_VERSION, "3\\.2") {
-        SYMBIAN_VERSION = 9.3
-    } else:contains(S60_VERSION, "5\\.0") {
-        SYMBIAN_VERSION = 9.4
-    } else:contains(S60_VERSION, "5\\.1") {
-        SYMBIAN_VERSION = Symbian2
-    } else:contains(S60_VERSION, "5\\.2") {
-        SYMBIAN_VERSION = Symbian3
+isEmpty(S60_VERSION) {
+    contains(SYMBIAN_VERSION, "9\\.2") {
+        S60_VERSION = 3.1
+    } else:contains(SYMBIAN_VERSION, "9\\.3") {
+        S60_VERSION = 3.2
+    } else:contains(SYMBIAN_VERSION, "9\\.4") {
+        S60_VERSION = 5.0
+    } else:contains(SYMBIAN_VERSION, "Symbian2") {
+        S60_VERSION = 5.1
+    } else:contains(SYMBIAN_VERSION, "Symbian3") {
+        S60_VERSION = 5.2
+    } else {
+        S60_VERSION = Unknown
     }
 }
 
@@ -174,14 +184,14 @@ isEmpty(SYMBIAN_VERSION) {
 
 default_deployment.pkg_prerules += pkg_depends_webkit pkg_depends_qt pkg_platform_dependencies
 
-# Supports S60 3.0, 3.1, 3.2, 5.0 and Symbian^3 by default
+# Supports S60 3.1, 3.2, 5.0, Symbian^3, and Symbian^4 by default
 pkg_platform_dependencies = \
     "; Default HW/platform dependencies" \
-    "[0x101F7961],0,0,0,{\"S60ProductID\"}" \
     "[0x102032BE],0,0,0,{\"S60ProductID\"}" \
     "[0x102752AE],0,0,0,{\"S60ProductID\"}" \
     "[0x1028315F],0,0,0,{\"S60ProductID\"}" \
-    "[0x20022e6d],0,0,0,{\"S60ProductID\"}" \
+    "[0x20022E6D],0,0,0,{\"S60ProductID\"}" \
+    "[0x20032DE7],0,0,0,{\"S60ProductID\"}" \
     " "
 
 DEPLOYMENT += default_deployment
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index 59a5e86..09c6587 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -45,32 +45,32 @@ breakpad {
         macx {
             equals(TEMPLATE, lib) {
                 lib_bundle {
-                    TARGET_FILENAME = $${TARGET_BASEPATH}$${TARGET}.framework/$${TARGET}
+                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}.framework/$${TARGET}
                 } else {
-                    TARGET_FILENAME = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}
+                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}
                     !plugin {
                         TEMP_VERSION = $$section(VERSION, ., 0, 0)
                         isEmpty(TEMP_VERSION):TEMP_VERSION = 1
-                        TARGET_FILENAME = $${TARGET_FILENAME}.$${TEMP_VERSION}
+                        TARGET_BASEPATH = $${TARGET_BASEPATH}.$${TEMP_VERSION}
                     }
-                    TARGET_FILENAME = $${TARGET_FILENAME}.$${QMAKE_EXTENSION_SHLIB}
+                    TARGET_BASEPATH = $${TARGET_BASEPATH}.$${QMAKE_EXTENSION_SHLIB}
                 }
             } else {
                 app_bundle {
-                    TARGET_FILENAME = $${TARGET_BASEPATH}$${TARGET}.app/Contents/MacOS/$${TARGET}
+                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}.app/Contents/MacOS/$${TARGET}
                 } else {
-                    TARGET_FILENAME = $${TARGET_BASEPATH}$${TARGET}
+                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}
                 }
             }
-            DEBUGFILENAME = $$TARGET_FILENAME
+            DEBUGFILENAME = $$TARGET_BASEPATH
         } else {
             equals(TEMPLATE, lib) {
                 plugin {
-                    TARGET_FILENAME = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so
+                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so
                 } else {
                     TEMP_VERSION = $$VERSION
                     isEmpty(TEMP_VERSION):TEMP_VERSION = 1.0.0
-                    TARGET_FILENAME = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so.$${TEMP_VERSION}
+                    TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so.$${TEMP_VERSION}
                 }
             } else {
                 TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}
@@ -87,7 +87,6 @@ breakpad {
     !isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$quote($$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$QMAKE_STRIP \"$$DEBUGFILENAME\")
 
     unset(TARGET_BASEPATH)
-    unset(TARGET_FILENAME)
     unset(SYMBOLFILENAME)
     unset(TARGET_EXT)
     unset(TARGET_VERSION_EXT)
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index 15e7fd9..89e9b40 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -39,22 +39,22 @@ win32:count($$list($$INCLUDEPATH), 40, >) {
     }
 }
 
-defineReplace(mocCmd) {
+defineReplace(mocCmdBase) {
     !isEmpty(WIN_INCLUDETEMP) {
         RET =
         if(contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc")) {
             RET += $$mocinclude.commands
         }
-        RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) \"$$1\" -o $$2
+        RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D)
         return($$RET)
     }
-    return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) \"$$1\" -o $$2)
+    return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D))
 }
 
 #moc headers
 moc_header.CONFIG = moc_verify
 moc_header.dependency_type = TYPE_C
-moc_header.commands = ${QMAKE_FUNC_mocCmd}
+moc_header.commands = ${QMAKE_FUNC_mocCmdBase} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
 moc_header.output = $$MOC_DIR/$${QMAKE_H_MOD_MOC}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_CPP)}
 moc_header.input = HEADERS
 moc_header.variable_out = SOURCES
@@ -69,7 +69,7 @@ INCREDIBUILD_XGE += moc_header
 #moc sources
 moc_source.CONFIG = no_link moc_verify
 moc_source.dependency_type = TYPE_C
-moc_source.commands = ${QMAKE_FUNC_mocCmd}
+moc_source.commands = ${QMAKE_FUNC_mocCmdBase} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
 moc_source.output = $$MOC_DIR/$${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_EXT_CPP_MOC}
 moc_source.input = SOURCES OBJECTIVE_SOURCES
 moc_source.name = MOC ${QMAKE_FILE_IN}
diff --git a/mkspecs/features/symbian/sis_targets.prf b/mkspecs/features/symbian/sis_targets.prf
index 800a04c..e838e10 100644
--- a/mkspecs/features/symbian/sis_targets.prf
+++ b/mkspecs/features/symbian/sis_targets.prf
@@ -37,7 +37,7 @@ equals(GENERATE_SIS_TARGETS, true) {
                               )
 
         ok_sis_target.target = ok_sis
-        ok_sis_target.commands = createpackage.bat $$CONVERT_GCCE_PARAM $(QT_SIS_OPTIONS) $${baseTarget}_template.pkg \
+        ok_sis_target.commands = 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
@@ -56,7 +56,7 @@ equals(GENERATE_SIS_TARGETS, true) {
                               )
 
         ok_unsigned_sis_target.target = ok_unsigned_sis
-        ok_unsigned_sis_target.commands = createpackage.bat $$CONVERT_GCCE_PARAM $(QT_SIS_OPTIONS) -o $${baseTarget}_template.pkg $(QT_SIS_TARGET)
+        ok_unsigned_sis_target.commands = 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
@@ -67,12 +67,23 @@ equals(GENERATE_SIS_TARGETS, true) {
                                         , \
                                             $(MAKE) -f $(MAKEFILE) fail_sis_nopkg \
                                         )
-        installer_sis_target.depends = $${baseTarget}.sis
+        installer_sis_target.depends = sis
 
         ok_installer_sis_target.target = ok_installer_sis
-        ok_installer_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \
+        ok_installer_sis_target.commands = createpackage $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \
                                                $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
 
+        unsigned_installer_sis_target.target = unsigned_installer_sis
+        unsigned_installer_sis_target.commands = $(if $(wildcard $${baseTarget}_installer.pkg), \
+                                            $(MAKE) -f $(MAKEFILE) ok_unsigned_installer_sis \
+                                        , \
+                                            $(MAKE) -f $(MAKEFILE) fail_sis_nopkg \
+                                        )
+        unsigned_installer_sis_target.depends = 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
+
         fail_sis_nopkg_target.target = fail_sis_nopkg
         fail_sis_nopkg_target.commands = "$(error PKG file does not exist, 'sis' and 'installer_sis' target are only supported for executables or projects with DEPLOYMENT statement)"
 
@@ -95,7 +106,7 @@ equals(GENERATE_SIS_TARGETS, true) {
                                    )
 
         ok_stub_sis_target.target = ok_stub_sis
-        ok_stub_sis_target.commands = createpackage.bat -s $(QT_SIS_OPTIONS) $${baseTarget}_stub.pkg \
+        ok_stub_sis_target.commands = 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 \
@@ -105,6 +116,8 @@ equals(GENERATE_SIS_TARGETS, true) {
                                target_sis_target \
                                installer_sis_target \
                                ok_installer_sis_target \
+                               unsigned_installer_sis_target \
+                               ok_unsigned_installer_sis_target \
                                fail_sis_nopkg_target \
                                fail_sis_nocache_target \
                                stub_sis_target \
@@ -127,7 +140,6 @@ equals(GENERATE_SIS_TARGETS, true) {
                 && echo $${shellFixedHash}  Version     :  >> $$make_cache_name \
                 && echo $${shellFixedHash} >> $$make_cache_name \
                 && echo $${shellFixedHash} ============================================================================== >> $$make_cache_name \
-                && echo. >> $$make_cache_name \
                 && echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> $$make_cache_name
 
             QMAKE_EXTRA_TARGETS += store_build_target
@@ -154,17 +166,24 @@ equals(GENERATE_SIS_TARGETS, true) {
         installer_sis_target.target = installer_sis
         installer_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \
                                             $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
-        installer_sis_target.depends = $${sis_destdir}/$${baseTarget}.sis
+        installer_sis_target.depends = sis
+
+        unsigned_installer_sis_target.target = unsigned_installer_sis
+        unsigned_installer_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) -o $${baseTarget}_installer.pkg
+        unsigned_installer_sis_target.depends = unsigned_sis
 
         !isEmpty(sis_destdir):!equals(sis_destdir, "."):!equals(sis_destdir, "./") {
             sis_target.commands += && $$QMAKE_MOVE $${baseTarget}.sis $$sis_destdir
-            installer_sis_target.commands += && $$QMAKE_MOVE $${baseTarget}.sis $$sis_destdir
+            unsigned_sis_target.commands += && $$QMAKE_MOVE $${baseTarget}_unsigned.sis $$sis_destdir
+            installer_sis_target.commands += && $$QMAKE_MOVE $${baseTarget}_installer.sis $$sis_destdir
+            unsigned_installer_sis_target.commands += && $$QMAKE_MOVE $${baseTarget}_unsigned_installer.sis $$sis_destdir
         }
 
         QMAKE_EXTRA_TARGETS += sis_target \
                                unsigned_sis_target \
                                target_sis_target \
-                               installer_sis_target
+                               installer_sis_target \
+                               unsigned_installer_sis_target
 
         QMAKE_DISTCLEAN += $${sis_destdir}/$${baseTarget}.sis
     }
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index f40a465..6867d86 100644
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -21,7 +21,7 @@ QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		=
+QMAKE_CFLAGS		= -falign-stack=maintain-16-byte
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -w1 -Wcheck -wd654,1572,411,873,1125
 QMAKE_CFLAGS_WARN_OFF	= -w