diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-06-27 23:36:19 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-06-27 23:36:19 (GMT) |
| commit | 580586d63a219bd63816071426fafec63a864d0d (patch) | |
| tree | 59540e07c7e56b51d5b6275e2018c4b5cdef2c1e /src/gui/kernel/qapplication_s60.cpp | |
| parent | 361f409d513b7360b1a6f919799cc1948835aef3 (diff) | |
| parent | 59c58576efd3ceff7add46a359fd99e56a2fb279 (diff) | |
| download | Qt-580586d63a219bd63816071426fafec63a864d0d.zip Qt-580586d63a219bd63816071426fafec63a864d0d.tar.gz Qt-580586d63a219bd63816071426fafec63a864d0d.tar.bz2 | |
Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7
Diffstat (limited to 'src/gui/kernel/qapplication_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index d5d4be6..a7c7310 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1441,6 +1441,8 @@ void qt_init(QApplicationPrivate * /* priv */, int) qRegisterMetaType<WId>("WId"); } +extern void qt_cleanup_symbianFontDatabaseExtras(); // qfontdatabase_s60.cpp + /***************************************************************************** qt_cleanup() - cleans up when the application is finished *****************************************************************************/ @@ -1451,6 +1453,7 @@ void qt_cleanup() qt_S60Beep = 0; } QFontCache::cleanup(); // Has to happen now, since QFontEngineS60 has FBS handles + qt_cleanup_symbianFontDatabaseExtras(); // S60 structure and window server session are freed in eventdispatcher destructor as they are needed there // It's important that this happens here, before the event dispatcher gets |