Improved Symbian4 platform detection

Now returns correct value for Symbian4 platforms with
QSysInfo::symbianVersion(). SYMBIAN_VERSION .pro file variable should
also return correct value even if it doesn't get set in environment.prf.

Task-number: QTBUG-13802
Reviewed-by: Shane Kearns
Reviewed-by: Janne Anttila

1 files changed, 36 insertions, 26 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