Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	doc/src/declarative/example-slideswitch.qdoc
	doc/src/development/qmake-manual.qdoc
	doc/src/snippets/code/doc_src_qmake-manual.pro
	doc/src/snippets/code/doc_src_qtscript.qdoc
	src/corelib/animation/qabstractanimation.cpp
	src/s60installs/bwins/QtOpenGLu.def
	src/s60installs/eabi/QtOpenGLu.def
	src/s60installs/eabi/QtOpenVGu.def
	tests/auto/qdir/qdir.pro
	tests/auto/qsslsocket/tst_qsslsocket.cpp
	tools/qdoc3/doc/qdoc-manual.qdocconf

3 files changed, 20 insertions, 29 deletions

diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 74acc64..549113a 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -162,28 +162,35 @@ exists($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf) {
 }
 
 # Try to detect SDK version if it wasn't set by environment.prf
-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
+isEmpty(SYMBIAN_VERSION)|isEmpty(S60_VERSION) {
+    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.3.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.3.sis) {
+        isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = Symbian3
+        isEmpty(S60_VERSION): S60_VERSION = 5.3
     } else {
         # 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
+            isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = Symbian3
+            isEmpty(S60_VERSION): S60_VERSION = 5.2
         } else {
             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
+                isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = Symbian2
+                isEmpty(S60_VERSION): S60_VERSION = 5.1
             } else {
                 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
+                    isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = 9.4
+                    isEmpty(S60_VERSION): 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) {
-                        SYMBIAN_VERSION = 9.3
+                        isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = 9.3
+                        isEmpty(S60_VERSION): S60_VERSION = 3.2
                     } 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
+                            isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = 9.2
+                            isEmpty(S60_VERSION): S60_VERSION = 3.1
                         } else {
-                            SYMBIAN_VERSION = Unknown
+                            isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = Unknown
+                            isEmpty(S60_VERSION): S60_VERSION = Unknown
                         }
                     }
                 }
@@ -192,22 +199,6 @@ isEmpty(SYMBIAN_VERSION) {
     }
 }
 
-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
-    }
-}
-
 # pkg_depends_webkit, pkg_depends_core, and pkg_platform_dependencies can be removed by developer
 # if multiple languages need to be supported by pkg file. In that case the developer should declare
 # multiple language compatible dependency statements him/herself.
diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf
index 98ab547..470372e 100644
--- a/mkspecs/features/symbian/default_post.prf
+++ b/mkspecs/features/symbian/default_post.prf
@@ -85,13 +85,13 @@ 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 Symbian^3 and Symbian^4 by default and also S60 3.1, 3.2, and 5.0 if built against any of those.
+# Supports Symbian^3 platforms 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" \
     "[0x20022E6D],0,0,0,{$$platform_product_id}" \
-    "[0x20032DE7],0,0,0,{$$platform_product_id}"
+    "[0x2003A678],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}" \
diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf
index 7e077a1..efc3de2 100644
--- a/mkspecs/unsupported/win32-g++-cross/qmake.conf
+++ b/mkspecs/unsupported/win32-g++-cross/qmake.conf
@@ -52,8 +52,8 @@ QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 QMAKE_LINK		= i686-pc-mingw32-g++
 QMAKE_LINK_C		= i686-pc-mingw32-gcc
-QMAKE_LFLAGS		= -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
-QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
+QMAKE_LFLAGS		= -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
+QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
 QMAKE_LFLAGS_EXCEPTIONS_OFF =
 QMAKE_LFLAGS_RELEASE	= -Wl,-s
 QMAKE_LFLAGS_DEBUG	=