From 71304aefd0668f6ba2d41ef84d7f48aaa95db06f Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Tue, 7 Jun 2011 15:06:53 +0200
Subject: reset certain global variables on deletion

qt_button_down needs to be reset to 0 if it
points to the widget being deleted.

Reviewed-by: Samuel
---
 src/widgets/kernel/qwidget_qpa.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index 2867fdc45f..4bf8d5dd73 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -153,6 +153,7 @@ void QWidget::destroy(bool destroyWindow, bool destroySubWindows)
     d->aboutToDestroy();
     if (!isWindow() && parentWidget())
         parentWidget()->d_func()->invalidateBuffer(d->effectiveRectFor(geometry()));
+    d->deactivateWidgetCleanup();
 
     if ((windowType() == Qt::Popup))
         qApp->d_func()->closePopup(this);
@@ -470,6 +471,7 @@ void QWidgetPrivate::hide_sys()
 {
     Q_Q(QWidget);
     q->setAttribute(Qt::WA_Mapped, false);
+    deactivateWidgetCleanup();
     if (!q->isWindow()) {
         QWidget *p = q->parentWidget();
         if (p &&p->isVisible()) {
-- 
cgit v1.2.3