From 0273bc5d22cd1fa08854b023f9b6c318fc75f3fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Mon, 6 Jun 2011 12:37:55 +0200
Subject: Made tst_QWidget::repaintWhenChildDeleted() pass.

Implement some missing functionality in QWidget::destroy().
---
 src/widgets/kernel/qwidget_qpa.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/widgets')

diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index 169977db25..2867fdc45f 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -150,12 +150,18 @@ void QWidget::destroy(bool destroyWindow, bool destroySubWindows)
 {
     Q_D(QWidget);
 
+    d->aboutToDestroy();
+    if (!isWindow() && parentWidget())
+        parentWidget()->d_func()->invalidateBuffer(d->effectiveRectFor(geometry()));
+
     if ((windowType() == Qt::Popup))
         qApp->d_func()->closePopup(this);
 
     if (this == QApplicationPrivate::active_window)
         QApplication::setActiveWindow(0);
 
+    setAttribute(Qt::WA_WState_Created, false);
+
     if (windowType() != Qt::Desktop) {
         if (destroySubWindows) {
             QObjectList childList(children());
@@ -175,6 +181,8 @@ void QWidget::destroy(bool destroyWindow, bool destroySubWindows)
                 d->hide_sys();
             }
         }
+
+        d->setWinId(0);
     }
 }
 
-- 
cgit v1.2.3