From 821619ea1a4962b87e509c9aeedb35cd6a4b0434 Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald@trolltech.com>
Date: Thu, 20 Aug 2009 11:33:10 +0200
Subject: Move the declarative ui destroyed handling

Otherwise, the qWarning will be bogus.
---
 src/corelib/kernel/qobject.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 55c8e12..5247290 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -836,8 +836,6 @@ QObject::~QObject()
 
     QT_TRY {
         emit destroyed(this);
-        if (d->declarativeData)
-            d->declarativeData->destroyed(this);  // ### TODO: Can this throw?
     } QT_CATCH(...) {
         // all the signal/slots connections are still in place - if we don't
         // quit now, we will crash pretty soon.
@@ -854,6 +852,8 @@ QObject::~QObject()
 #endif
     }
 
+    if (d->declarativeData)
+        d->declarativeData->destroyed(this);
 
     {
         QMutex *signalSlotMutex = 0;
-- 
cgit v0.12