diff options
| author | Pasi Pentikainen <ext-pasi.a.pentikainen@nokia.com> | 2012-04-12 11:41:29 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-13 12:27:35 (GMT) |
| commit | 2af5b76824c21f5b9654d7d9ed8d42a03dd0e2c0 (patch) | |
| tree | 72eda5c556f953701b3f88f76f5146aefe1a45c9 /src | |
| parent | 94df302a8d62c995dedadce0f9a9519a158fd369 (diff) | |
| download | Qt-2af5b76824c21f5b9654d7d9ed8d42a03dd0e2c0.zip Qt-2af5b76824c21f5b9654d7d9ed8d42a03dd0e2c0.tar.gz Qt-2af5b76824c21f5b9654d7d9ed8d42a03dd0e2c0.tar.bz2 | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 10 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 6 |
2 files changed, 13 insertions, 3 deletions
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 |