From fb8d0593198313b975ed6c0c9ba99624d1d1fbec Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Fri, 5 Feb 2010 16:44:51 +0100 Subject: 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 --- src/gui/kernel/qwidget.cpp | 2 ++ 1 file changed, 2 insertions(+) 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)) -- cgit v0.12