diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-24 22:00:19 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-24 22:00:19 (GMT) |
| commit | 81d25b1c69dc186eaa3d3993e74ae132cc8f582a (patch) | |
| tree | 7034202e9b2108c2d0ced275448e8ececf816612 /src/corelib/global/qglobal.h | |
| parent | 84d278501a19eaccf9a77cccd95ca5d17a2dcd2b (diff) | |
| parent | f28d3e2f6c09abe7629779a8b10f3caa9007c468 (diff) | |
| download | Qt-81d25b1c69dc186eaa3d3993e74ae132cc8f582a.zip Qt-81d25b1c69dc186eaa3d3993e74ae132cc8f582a.tar.gz Qt-81d25b1c69dc186eaa3d3993e74ae132cc8f582a.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
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, |