diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-26 23:37:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-26 23:37:57 (GMT) |
| commit | 8f21474fb8b8d51d00d71f566e1b291b926b42bd (patch) | |
| tree | 8d75d6d21c1e55a2866e11aa1bb9f0f922299672 /src/gui/kernel | |
| parent | 47769726d3d8db03153acfcd9552fd9bc0535358 (diff) | |
| parent | 5d7c1a1148d4c779cbcb5242ac6106c6ee35d57b (diff) | |
| download | Qt-8f21474fb8b8d51d00d71f566e1b291b926b42bd.zip Qt-8f21474fb8b8d51d00d71f566e1b291b926b42bd.tar.gz Qt-8f21474fb8b8d51d00d71f566e1b291b926b42bd.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:
Fixed package creation when shadow building.
Fix crash caused by not clearing the QPixmapCache on application exit.
Removed QEXPECT_FAIL macros from test cases which now pass
Ensure backing store is deleted before top-level window
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 0d65811..1c06100 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -382,6 +382,10 @@ void QSymbianControl::ConstructL(bool isWindowOwning, bool desktop) QSymbianControl::~QSymbianControl() { + // Ensure backing store is deleted before the top-level + // window is destroyed + qt_widget_private(qwidget)->topData()->backingStore.destroy(); + if (S60->curWin == this) S60->curWin = 0; if (!QApplicationPrivate::is_app_closing) { @@ -1456,6 +1460,8 @@ void qt_cleanup() qt_S60Beep = 0; } QFontCache::cleanup(); // Has to happen now, since QFontEngineS60 has FBS handles + QPixmapCache::clear(); // Has to happen now, since QS60PixmapData has FBS handles + qt_cleanup_symbianFontDatabaseExtras(); // S60 structure and window server session are freed in eventdispatcher destructor as they are needed there |