diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-26 11:37:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-26 11:37:31 (GMT) |
| commit | db501e24d460231590c7e30cb8704c132efc3e8e (patch) | |
| tree | c429fa83e68ce2d1c71509d4e08a44ee689767d7 /src | |
| parent | 498189595db84d3ae780a365d444eda27d627dfe (diff) | |
| parent | 3695cb25e4a53921880cfea4d4c731df44fa4396 (diff) | |
| download | Qt-db501e24d460231590c7e30cb8704c132efc3e8e.zip Qt-db501e24d460231590c7e30cb8704c132efc3e8e.tar.gz Qt-db501e24d460231590c7e30cb8704c132efc3e8e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Removed QEXPECT_FAIL macros from test cases which now pass
Ensure backing store is deleted before top-level window
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index f39b462..d5ff792 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -371,6 +371,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) { |