Add new QSysInfo::symbianVersion() enums

Add new enums for future Symbian platforms.

Task-number: QT-4593
Change-Id: I23b616c6d62d9d56d2b8ec6ac7edb8f6a84211e8
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>

3 files changed, 43 insertions, 28 deletions

diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 4e9690d..fd9726e 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -173,38 +173,43 @@ 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.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
+    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.5.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.5.sis) {
+        isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = 5.5
+        isEmpty(S60_VERSION): S60_VERSION = 5.5
     } else {
-        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
+        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 b813afc..dde8ada 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -1205,6 +1205,7 @@ bool qSharedBuild()
     \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_API_5_5 Symbian/S60 API version 5.5 release
     \value SV_Unknown An unknown and currently unsupported platform
 
     \sa S60Version, WinVersion, MacVersion
@@ -1225,6 +1226,7 @@ bool qSharedBuild()
     \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_5_5 Symbian/S60 API version 5.5 release
     \value SV_S60_Unknown An unknown and currently unsupported platform
     \omitvalue SV_S60_None
 
@@ -1821,9 +1823,12 @@ static void symbianInitVersions()
                 } else if (minor == 3) {
                     cachedS60Version = QSysInfo::SV_S60_5_3;
                     cachedSymbianVersion = QSysInfo::SV_API_5_3;
-                } else if (minor >= 4) {
+                } else if (minor == 4) {
                     cachedS60Version = QSysInfo::SV_S60_5_4;
                     cachedSymbianVersion = QSysInfo::SV_API_5_4;
+                } else if (minor >= 5) {
+                    cachedS60Version = QSysInfo::SV_S60_5_5;
+                    cachedSymbianVersion = QSysInfo::SV_API_5_5;
                 }
             }
         }
@@ -1853,6 +1858,9 @@ static void symbianInitVersions()
 #   elif defined(S60_VERSION_5_4)
         cachedS60Version = QSysInfo::SV_S60_5_4;
         cachedSymbianVersion = QSysInfo::SV_API_5_4;
+#   elif defined(S60_VERSION_5_5)
+        cachedS60Version = QSysInfo::SV_S60_5_5;
+        cachedSymbianVersion = QSysInfo::SV_API_5_5;
 #   endif
     }
 #  endif
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index ed8f9eb..3cbb1c7 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1629,7 +1629,8 @@ public:
         SV_SF_3 = 50,
         SV_SF_4 = 60,  // Deprecated
         SV_API_5_3 = 70,
-        SV_API_5_4 = 80
+        SV_API_5_4 = 80,
+        SV_API_5_5 = 90
     };
     static SymbianVersion symbianVersion();
     enum S60Version {
@@ -1641,7 +1642,8 @@ public:
         SV_S60_5_1 = SV_SF_2,  // Deprecated
         SV_S60_5_2 = SV_SF_3,
         SV_S60_5_3 = SV_API_5_3,
-        SV_S60_5_4 = SV_API_5_4
+        SV_S60_5_4 = SV_API_5_4,
+        SV_S60_5_5 = SV_API_5_5
     };
     static S60Version s60Version();
 #endif