diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-02-05 15:44:51 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-02-05 15:51:03 (GMT) |
| commit | fb8d0593198313b975ed6c0c9ba99624d1d1fbec (patch) | |
| tree | 1f241d955364df102b0ce9e71dbbba268ef63422 | |
| parent | 381f5ae82cccec3774b68674b4c0e782e9f49f6f (diff) | |
| download | Qt-fb8d0593198313b975ed6c0c9ba99624d1d1fbec.zip Qt-fb8d0593198313b975ed6c0c9ba99624d1d1fbec.tar.gz Qt-fb8d0593198313b975ed6c0c9ba99624d1d1fbec.tar.bz2 | |
Revert change 34f1758 on non-Synbian platforms
The change introduces behavior changes (including crashing on QWS).
It is only critical for Symbian. To reduce risk, we only apply it
on the Symbian platform for now.
Task-number: Autotest regression
Reviewed-by: Jesper
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 72388f0..c072d9d 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -1439,6 +1439,7 @@ QWidget::~QWidget() } #endif +#ifdef Q_OS_SYMBIAN if (d->extra && d->extra->topextra && d->extra->topextra->backingStore) { // Okay, we are about to destroy the top-level window that owns // the backing store. Make sure we delete the backing store right away @@ -1449,6 +1450,7 @@ QWidget::~QWidget() delete d->extra->topextra->backingStore; d->extra->topextra->backingStore = 0; } +#endif if (QWidgetBackingStore *bs = d->maybeBackingStore()) { bs->removeDirtyWidget(this); if (testAttribute(Qt::WA_StaticContents)) |