diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-06 14:13:01 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-06 14:13:01 (GMT) |
| commit | bb4e1cefdf4d8302d89914e54e6ff7e2fc9481e8 (patch) | |
| tree | 0feff5b756825243df3fa7e5d2dd564135f8bed8 /src/corelib/global/qglobal.h | |
| parent | 496341552bb178d1bd13474fd3259898fc7c9cfd (diff) | |
| parent | ac0a7503d58946b38d4d18bb077dd9530ccbb6f9 (diff) | |
| download | Qt-bb4e1cefdf4d8302d89914e54e6ff7e2fc9481e8.zip Qt-bb4e1cefdf4d8302d89914e54e6ff7e2fc9481e8.tar.gz Qt-bb4e1cefdf4d8302d89914e54e6ff7e2fc9481e8.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-team
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 6469b46..9434eb2 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1617,7 +1617,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 { @@ -1626,9 +1628,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 @@ -2750,6 +2753,12 @@ QT_LICENSED_MODULE(DBus) # endif #endif +#if !(defined(Q_WS_WIN) && !defined(Q_WS_WINCE)) \ + && !(defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)) \ + && !(defined(Q_WS_X11) && !defined(QT_NO_FREETYPE)) +# define QT_NO_RAWFONT +#endif + QT_END_NAMESPACE QT_END_HEADER |