diff options
| author | João Abecasis <joao@abecasis.name> | 2009-11-06 10:55:39 (GMT) |
|---|---|---|
| committer | João Abecasis <joao@abecasis.name> | 2009-11-06 10:55:39 (GMT) |
| commit | 5ab96eb2df98bf7f0c8e7d7e676e548f15c2f4a3 (patch) | |
| tree | 006093748b4105232c6cc502e5b35216e90583c3 /src/corelib | |
| parent | ad3e723c334d72b746979b284910ac9b698b2d0b (diff) | |
| parent | 0625bb69685d768891fe882b788d56285eb9a1ee (diff) | |
| download | Qt-5ab96eb2df98bf7f0c8e7d7e676e548f15c2f4a3.zip Qt-5ab96eb2df98bf7f0c8e7d7e676e548f15c2f4a3.tar.gz Qt-5ab96eb2df98bf7f0c8e7d7e676e548f15c2f4a3.tar.bz2 | |
Merge commit 'origin/4.6' into large-file-support
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 5578091..62b5409 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1191,6 +1191,10 @@ bool qSharedBuild() \value SV_9_2 Symbian OS v9.2 \value SV_9_3 Symbian OS v9.3 \value SV_9_4 Symbian OS v9.4 + \value SV_SF_1 Symbian^1 + \value SV_SF_2 Symbian^2 + \value SV_SF_3 Symbian^3 + \value SV_SF_4 Symbian^4 \value SV_Unknown An unknown and currently unsupported platform \sa S60Version, WinVersion, MacVersion @@ -1207,6 +1211,8 @@ bool qSharedBuild() \value SV_S60_3_1 S60 3rd Edition Feature Pack 1 \value SV_S60_3_2 S60 3rd Edition Feature Pack 2 \value SV_S60_5_0 S60 5th Edition + \value SV_S60_5_1 S60 5th Edition Feature Pack 1 + \value SV_S60_5_2 S60 5th Edition Feature Pack 2 \value SV_S60_Unknown An unknown and currently unsupported platform \omitvalue SV_S60_None |