diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-28 23:00:13 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-28 23:00:13 (GMT) |
| commit | ecc412f02004d4e6c0b56d4daa54a387131619dc (patch) | |
| tree | f5d928347345e8c875f9f7465b7c77725d4555d4 /src/gui/kernel | |
| parent | a1e3906c5d4b4c25356b56292b650a20e4895f41 (diff) | |
| parent | cf5695691682957b68b67fd951addf4a52bfba84 (diff) | |
| download | Qt-ecc412f02004d4e6c0b56d4daa54a387131619dc.zip Qt-ecc412f02004d4e6c0b56d4daa54a387131619dc.tar.gz Qt-ecc412f02004d4e6c0b56d4daa54a387131619dc.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 954d7fb..a9634d8 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -590,7 +590,11 @@ QSymbianControl::~QSymbianControl() { // Ensure backing store is deleted before the top-level // window is destroyed - qt_widget_private(qwidget)->topData()->backingStore.destroy(); + QT_TRY { + qt_widget_private(qwidget)->topData()->backingStore.destroy(); + } QT_CATCH(const std::exception&) { + // ignore exceptions, nothing can be done + } if (S60->curWin == this) S60->curWin = 0; |