Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Add new QSysInfo::symbianVersion() enums

3 files changed, 50 insertions, 33 deletions

diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 8e04099..0288ada 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -164,34 +164,39 @@ 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)|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
+    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.4.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.4.sis) {
+        isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = 5.4
+        isEmpty(S60_VERSION): S60_VERSION = 5.4
     } 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) {
-            isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = Symbian3
-            isEmpty(S60_VERSION): S60_VERSION = 5.2
+        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 = 5.3
+            isEmpty(S60_VERSION): S60_VERSION = 5.3
         } else {
-            exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.1.sis) {
-                isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = Symbian2
-                isEmpty(S60_VERSION): 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) {
+                isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = Symbian3
+                isEmpty(S60_VERSION): S60_VERSION = 5.2
             } else {
-                exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) {
-                    isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = 9.4
-                    isEmpty(S60_VERSION): 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) {
+                    isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = Symbian2
+                    isEmpty(S60_VERSION): S60_VERSION = 5.1
                 } else {
-                    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) {
-                        isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = 9.3
-                        isEmpty(S60_VERSION): 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) {
+                        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.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.1.sis) {
-                            isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = 9.2
-                            isEmpty(S60_VERSION): 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) {
+                            isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = 9.3
+                            isEmpty(S60_VERSION): S60_VERSION = 3.2
                         } else {
-                            isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = Unknown
-                            isEmpty(S60_VERSION): S60_VERSION = Unknown
+                            exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.1.sis) {
+                                isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = 9.2
+                                isEmpty(S60_VERSION): S60_VERSION = 3.1
+                            } else {
+                                isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = Unknown
+                                isEmpty(S60_VERSION): S60_VERSION = Unknown
+                            }
                         }
                     }
                 }
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 35719b1..2cfd9cc 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -1197,10 +1197,12 @@ bool qSharedBuild()
     \value SV_9_2 Symbian OS v9.2
     \value SV_9_3 Symbian OS v9.3
     \value SV_9_4 Symbian OS v9.4
-    \value SV_SF_1 Symbian^1
+    \value SV_SF_1 S60 5th Edition (Symbian^1)
     \value SV_SF_2 Symbian^2
-    \value SV_SF_3 Symbian^3
+    \value SV_SF_3 Symbian^3 or Symbian Anna
     \value SV_SF_4 \e{This enum value is deprecated.}
+    \value SV_API_5_3 Symbian/S60 API version 5.3 release
+    \value SV_API_5_4 Symbian/S60 API version 5.4 release
     \value SV_Unknown An unknown and currently unsupported platform
 
     \sa S60Version, WinVersion, MacVersion
@@ -1217,9 +1219,10 @@ bool qSharedBuild()
     \value SV_S60_3_1 S60 3rd Edition Feature Pack 1
     \value SV_S60_3_2 S60 3rd Edition Feature Pack 2
     \value SV_S60_5_0 S60 5th Edition
-    \value SV_S60_5_1 S60 5th Edition Feature Pack 1
-    \value SV_S60_5_2 Symbian^3
-    \value SV_S60_5_3 To be determined - FIXME
+    \value SV_S60_5_1 \e{This enum value is deprecated.}
+    \value SV_S60_5_2 Symbian^3 and Symbian Anna
+    \value SV_S60_5_3 Symbian/S60 API version 5.3 release
+    \value SV_S60_5_4 Symbian/S60 API version 5.4 release
     \value SV_S60_Unknown An unknown and currently unsupported platform
     \omitvalue SV_S60_None
 
@@ -1852,9 +1855,12 @@ static void symbianInitVersions()
                 } else if (minor == 2) {
                     cachedS60Version = QSysInfo::SV_S60_5_2;
                     cachedSymbianVersion = QSysInfo::SV_SF_3;
-                } else if (minor >= 3) {
+                } else if (minor == 3) {
                     cachedS60Version = QSysInfo::SV_S60_5_3;
-                    cachedSymbianVersion = QSysInfo::SV_SF_3;
+                    cachedSymbianVersion = QSysInfo::SV_API_5_3;
+                } else if (minor >= 4) {
+                    cachedS60Version = QSysInfo::SV_S60_5_4;
+                    cachedSymbianVersion = QSysInfo::SV_API_5_4;
                 }
             }
         }
@@ -1880,7 +1886,10 @@ static void symbianInitVersions()
         cachedSymbianVersion = QSysInfo::SV_SF_3;
 #   elif defined(S60_VERSION_5_3)
         cachedS60Version = QSysInfo::SV_S60_5_3;
-        cachedSymbianVersion = QSysInfo::SV_SF_3;
+        cachedSymbianVersion = QSysInfo::SV_API_5_3;
+#   elif defined(S60_VERSION_5_4)
+        cachedS60Version = QSysInfo::SV_S60_5_4;
+        cachedSymbianVersion = QSysInfo::SV_API_5_4;
 #   endif
     }
 #  endif
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 7768b46..e5109e6 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1524,7 +1524,9 @@ public:
         SV_SF_1 = SV_9_4,
         SV_SF_2 = 40,
         SV_SF_3 = 50,
-        SV_SF_4 = 60  // Deprecated
+        SV_SF_4 = 60,  // Deprecated
+        SV_API_5_3 = 70,
+        SV_API_5_4 = 80
     };
     static SymbianVersion symbianVersion();
     enum S60Version {
@@ -1533,9 +1535,10 @@ public:
         SV_S60_3_1 = SV_9_2,
         SV_S60_3_2 = SV_9_3,
         SV_S60_5_0 = SV_9_4,
-        SV_S60_5_1 = SV_SF_2,
+        SV_S60_5_1 = SV_SF_2,  // Deprecated
         SV_S60_5_2 = SV_SF_3,
-        SV_S60_5_3 = 70
+        SV_S60_5_3 = SV_API_5_3,
+        SV_S60_5_4 = SV_API_5_4
     };
     static S60Version s60Version();
 #endif