diff options
| author | axis <qt-info@nokia.com> | 2009-08-17 06:50:54 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-08-17 08:33:41 (GMT) |
| commit | 5e3dd575014c11f13b7d1c056a13cc103ff96b0d (patch) | |
| tree | d5a54aedc6af11eac13e4596ed703266ee2be569 | |
| parent | 434ffd312d5579ceff6ce56d1afee42b776cc981 (diff) | |
| download | Qt-5e3dd575014c11f13b7d1c056a13cc103ff96b0d.zip Qt-5e3dd575014c11f13b7d1c056a13cc103ff96b0d.tar.gz Qt-5e3dd575014c11f13b7d1c056a13cc103ff96b0d.tar.bz2 | |
Changed to SymbianVersion enum after review.
RevBy: Trust me
AutoTest: It built...
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 14 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 6d88c91..a8c46f5 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1060,7 +1060,7 @@ bool qSharedBuild() */ /*! - \fn QSysInfo::SymVersion QSysInfo::symbianVersion() + \fn QSysInfo::SymbianVersion QSysInfo::symbianVersion() Returns the version of the Symbian operating system on which the application is run (Symbian only). @@ -1129,7 +1129,7 @@ bool qSharedBuild() \value WV_NT_based NT-based version of Windows \value WV_CE_based CE-based version of Windows - \sa MacVersion, SymVersion + \sa MacVersion, SymbianVersion */ /*! @@ -1158,11 +1158,11 @@ bool qSharedBuild() \value MV_LEOPARD Apple codename for MV_10_5 \value MV_SNOWLEOPARD Apple codename for MV_10_6 - \sa WinVersion, SymVersion + \sa WinVersion, SymbianVersion */ /*! - \enum QSysInfo::SymVersion + \enum QSysInfo::SymbianVersion This enum provides symbolic names for the various versions of the Symbian operating system. On Symbian, the @@ -1190,7 +1190,7 @@ bool qSharedBuild() \value SV_S60_5_0 S60 5th Edition \value SV_S60_Unknown An unknown and currently unsupported platform - \sa SymVersion, WinVersion, MacVersion + \sa SymbianVersion, WinVersion, MacVersion */ /*! @@ -1812,7 +1812,7 @@ QSysInfo::S60Version QSysInfo::s60Version() return cachedS60Version = SV_S60_Unknown; # endif } -QSysInfo::SymVersion QSysInfo::symbianVersion() +QSysInfo::SymbianVersion QSysInfo::symbianVersion() { switch (s60Version()) { case SV_S60_3_1: @@ -1831,7 +1831,7 @@ QSysInfo::S60Version QSysInfo::s60Version() return SV_S60_None; } -QSysInfo::SymVersion QSysInfo::symbianVersion() +QSysInfo::SymbianVersion QSysInfo::symbianVersion() { return SV_Unknown; } diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index b4ae2dc..d6ec7dd 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1472,13 +1472,13 @@ public: static const MacVersion MacintoshVersion; #endif #ifdef Q_OS_SYMBIAN - enum SymVersion { + enum SymbianVersion { SV_Unknown = 0x0000, SV_9_2 = 0x0001, SV_9_3 = 0x0002, SV_9_4 = 0x0004 }; - static SymVersion symbianVersion(); + static SymbianVersion symbianVersion(); enum S60Version { SV_S60_None = 0x0000, SV_S60_Unknown = 0x0001, |