diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-06 08:52:17 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-06 08:52:17 (GMT) |
commit | 58563dcb2cab0949d21337b7b7cd34e3bdd29bbc (patch) | |
tree | 2715d69c247748ba1501e50ec432415d3ffebcae /src/corelib/global/qglobal.h | |
parent | 564f65bdcf42bcdaceea902b99bcbfafef5b97f3 (diff) | |
parent | 2dc7fae7ea38a0169c4c5c78d0534d688347aacb (diff) | |
download | Qt-58563dcb2cab0949d21337b7b7cd34e3bdd29bbc.zip Qt-58563dcb2cab0949d21337b7b7cd34e3bdd29bbc.tar.gz Qt-58563dcb2cab0949d21337b7b7cd34e3bdd29bbc.tar.bz2 |
Merge branch '4.6'
Conflicts:
src/corelib/io/qdatastream.h
Diffstat (limited to 'src/corelib/global/qglobal.h')
-rw-r--r-- | src/corelib/global/qglobal.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 4783eb6..5cac107 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1478,17 +1478,17 @@ public: #ifdef Q_OS_SYMBIAN enum SymbianVersion { SV_Unknown = 0x0000, - SV_9_2 = 0x0001, - SV_9_3 = 0x0002, - SV_9_4 = 0x0004 + SV_9_2 = 10, + SV_9_3 = 20, + SV_9_4 = 30 }; static SymbianVersion symbianVersion(); enum S60Version { - SV_S60_None = 0x0000, - SV_S60_Unknown = 0x0001, - SV_S60_3_1 = 0x0002, - SV_S60_3_2 = 0x0004, - SV_S60_5_0 = 0x0008 + SV_S60_None = 0, + SV_S60_Unknown = 1, + SV_S60_3_1 = 10, + SV_S60_3_2 = 20, + SV_S60_5_0 = 30 }; static S60Version s60Version(); #endif |