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);
     }
 }