diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-05 13:23:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-05 13:23:02 (GMT) |
| commit | 059a2ff8d621d9c67e3a97969d34edb6e173a4f3 (patch) | |
| tree | c8a25b0077d37b30dec377dc552a60799c838a2e /src/gui/text | |
| parent | 8dde027451601ff82793a0f4f146ec0ae5932893 (diff) | |
| parent | 270c644937fb402332671208435ac600b280e5b8 (diff) | |
| download | Qt-059a2ff8d621d9c67e3a97969d34edb6e173a4f3.zip Qt-059a2ff8d621d9c67e3a97969d34edb6e173a4f3.tar.gz Qt-059a2ff8d621d9c67e3a97969d34edb6e173a4f3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix compile errors on S60 3.2
Fix to QGLWidget rendering with VG graphics system
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontdatabase_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp index f29c880..1c1bc29 100644 --- a/src/gui/text/qfontdatabase_s60.cpp +++ b/src/gui/text/qfontdatabase_s60.cpp @@ -58,7 +58,7 @@ #endif // SYMBIAN_ENABLE_SPLIT_HEADERS #endif // QT_NO_FREETYPE -#ifndef SYMBIAN_VERSION_9_4 +#if !defined(SYMBIAN_VERSION_9_4) && !defined(SYMBIAN_VERSION_9_3) && !defined(SYMBIAN_VERSION_9_2) #define SYMBIAN_LINKEDFONTS_SUPPORTED #endif // !SYMBIAN_VERSION_9_4 |