summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/kernel/qobject.cpp4
1 files 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;