summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.h
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@sosco.com>2009-10-30 11:14:39 (GMT)
committerShane Kearns <shane.kearns@sosco.com>2009-11-03 12:55:15 (GMT)
commitddbccf7f066d26d3420c9ed18d8c930200814ce1 (patch)
treeb378a6328fac120f68692638b77661c1479bba9b /src/corelib/global/qglobal.h
parentdc89c842779f87ce69882ba54fa8d5bb79e0edbd (diff)
downloadQt-ddbccf7f066d26d3420c9ed18d8c930200814ce1.zip
Qt-ddbccf7f066d26d3420c9ed18d8c930200814ce1.tar.gz
Qt-ddbccf7f066d26d3420c9ed18d8c930200814ce1.tar.bz2
Add the Symbian Foundation OS versions
Symbian^1 - SV_SF_1 Symbian^2 - SV_SF_2 etc. This is for the benefit of developers working with the Symbian master codelines. Reviewed-by: axis
Diffstat (limited to 'src/corelib/global/qglobal.h')
-rw-r--r--src/corelib/global/qglobal.h17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index cbb8fda..95f09ea 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1478,17 +1478,26 @@ public:
#ifdef Q_OS_SYMBIAN
enum SymbianVersion {
SV_Unknown = 0x0000,
+ //These are the Symbian Ltd versions 9.2-9.4
SV_9_2 = 10,
SV_9_3 = 20,
- SV_9_4 = 30
+ SV_9_4 = 30,
+ //Following values are the symbian foundation versions, i.e. Symbian^1 == SV_SF_1
+ SV_SF_1 = SV_9_4,
+ SV_SF_2 = 40,
+ SV_SF_3 = 50,
+ SV_SF_4 = 60
};
static SymbianVersion symbianVersion();
enum S60Version {
SV_S60_None = 0,
SV_S60_Unknown = 1,
- SV_S60_3_1 = 10,
- SV_S60_3_2 = 20,
- SV_S60_5_0 = 30
+ SV_S60_3_1 = SV_9_2,
+ SV_S60_3_2 = SV_9_3,
+ SV_S60_5_0 = SV_9_4,
+ //versions beyond 5.0 are to be confirmed - it is better to use symbian version
+ SV_S60_5_1 = SV_SF_2,
+ SV_S60_5_2 = SV_SF_3
};
static S60Version s60Version();
#endif