From 45c11a97a32170d0c6ab9265a102cc8d94fa63ee Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Tue, 16 Jun 2009 15:43:46 +0200
Subject: Fixing qml for QWidget support (crash)

QWidget deletes its children in its own constructor so we have
to cleanup before explicitly

Reviewed-by: Aaron Kennedy
(cherry picked from commit 59629ac728f2fdbc3047554d715e2f908b1844c4)
---
 src/gui/kernel/qwidget.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index bca607c..e24b7cb 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -1375,6 +1375,12 @@ QWidget::~QWidget()
     // set all QPointers for this object to zero
     QObjectPrivate::clearGuards(this);
 
+    if(d->declarativeData) {
+        QDeclarativeData *dd = d->declarativeData;
+        d->declarativeData = 0;
+        dd->destroyed(this);
+    }
+
     if (!d->children.isEmpty())
         d->deleteChildren();
 
-- 
cgit v0.12