diff options
| author | axis <qt-info@nokia.com> | 2009-10-05 12:21:32 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-05 12:26:54 (GMT) |
| commit | 19a6d4245ca152758d8dbc7f7d9ee0f0654c04f7 (patch) | |
| tree | b71d6e706635def41f6367dfcd16252b3569d646 | |
| parent | e1fbf1e016cbbf203964f3606ee2a34afe33bbd7 (diff) | |
| download | Qt-19a6d4245ca152758d8dbc7f7d9ee0f0654c04f7.zip Qt-19a6d4245ca152758d8dbc7f7d9ee0f0654c04f7.tar.gz Qt-19a6d4245ca152758d8dbc7f7d9ee0f0654c04f7.tar.bz2 | |
Stopped using bitfields for S60 and Symbian versions.
There is no reason for it, since they will never overlap.
Left a little space between numbers in case of patch releases.
RevBy: Iain
| -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 dcd4397..5720505 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 |