diff options
| author | Sami Merila <sami.merila@nokia.com> | 2011-04-18 10:49:02 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2011-04-18 10:49:02 (GMT) |
| commit | 990cb4de8ba27ad157ffa8854b49f05f41a2ac28 (patch) | |
| tree | c57157d5deaab0493322d974d50c0782f2a9a1c1 /src/corelib/global/qglobal.h | |
| parent | 7c1707ba2eb8998df9713b2539564a1daa3d7e8c (diff) | |
| parent | fb0d4ad8f585befb58f77f8d4eaf58944448b8a7 (diff) | |
| download | Qt-990cb4de8ba27ad157ffa8854b49f05f41a2ac28.zip Qt-990cb4de8ba27ad157ffa8854b49f05f41a2ac28.tar.gz Qt-990cb4de8ba27ad157ffa8854b49f05f41a2ac28.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 9 |
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 |