summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.h
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2011-04-18 07:54:53 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2011-04-18 08:06:17 (GMT)
commitfb0d4ad8f585befb58f77f8d4eaf58944448b8a7 (patch)
tree41b87c335ff4ed6efa5924eca5012a01bc531221 /src/corelib/global/qglobal.h
parentdc65a73fa38d1f85b75e9d4ad71ebdbc1c7d85f5 (diff)
downloadQt-fb0d4ad8f585befb58f77f8d4eaf58944448b8a7.zip
Qt-fb0d4ad8f585befb58f77f8d4eaf58944448b8a7.tar.gz
Qt-fb0d4ad8f585befb58f77f8d4eaf58944448b8a7.tar.bz2
Add new QSysInfo::symbianVersion() enums
Add new enums for future Symbian platforms and fix the docs of existing ones. Task-number: QT-4593 Reviewed-by: Sami Merila
Diffstat (limited to 'src/corelib/global/qglobal.h')
-rw-r--r--src/corelib/global/qglobal.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 7768b46..e5109e6 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1524,7 +1524,9 @@ public:
SV_SF_1 = SV_9_4,
SV_SF_2 = 40,
SV_SF_3 = 50,
- SV_SF_4 = 60 // Deprecated
+ SV_SF_4 = 60, // Deprecated
+ SV_API_5_3 = 70,
+ SV_API_5_4 = 80
};
static SymbianVersion symbianVersion();
enum S60Version {
@@ -1533,9 +1535,10 @@ public:
SV_S60_3_1 = SV_9_2,
SV_S60_3_2 = SV_9_3,
SV_S60_5_0 = SV_9_4,
- SV_S60_5_1 = SV_SF_2,
+ SV_S60_5_1 = SV_SF_2, // Deprecated
SV_S60_5_2 = SV_SF_3,
- SV_S60_5_3 = 70
+ SV_S60_5_3 = SV_API_5_3,
+ SV_S60_5_4 = SV_API_5_4
};
static S60Version s60Version();
#endif