diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-09-22 13:32:31 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-09-23 08:29:50 (GMT) |
| commit | 0aad0d2043e061469b7139483c489dc6f823490b (patch) | |
| tree | 6f8bed05633dbdf81724a7af5ea96608f922e4dd /src/corelib/global/qglobal.h | |
| parent | 979ab9bf9394210dc4812082fe40b083155447c5 (diff) | |
| download | Qt-0aad0d2043e061469b7139483c489dc6f823490b.zip Qt-0aad0d2043e061469b7139483c489dc6f823490b.tar.gz Qt-0aad0d2043e061469b7139483c489dc6f823490b.tar.bz2 | |
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
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index d04133b..6ef15d4 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1515,7 +1515,7 @@ public: #endif #ifdef Q_OS_SYMBIAN enum SymbianVersion { - SV_Unknown = 0x0000, + SV_Unknown = 1000000, // Assume unknown is something newer than what is supported //These are the Symbian Ltd versions 9.2-9.4 SV_9_2 = 10, SV_9_3 = 20, @@ -1529,7 +1529,7 @@ public: static SymbianVersion symbianVersion(); enum S60Version { SV_S60_None = 0, - SV_S60_Unknown = 1, + SV_S60_Unknown = SV_Unknown, SV_S60_3_1 = SV_9_2, SV_S60_3_2 = SV_9_3, SV_S60_5_0 = SV_9_4, |