diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-08-20 09:33:10 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald@trolltech.com> | 2009-08-20 09:33:10 (GMT) |
| commit | 821619ea1a4962b87e509c9aeedb35cd6a4b0434 (patch) | |
| tree | 3ccd3b1a20464d9cbeecb459d435bdcb417a521c /src/corelib | |
| parent | 7a9a09fea2926e003e15d1220ca7de089a108a8c (diff) | |
| download | Qt-821619ea1a4962b87e509c9aeedb35cd6a4b0434.zip Qt-821619ea1a4962b87e509c9aeedb35cd6a4b0434.tar.gz Qt-821619ea1a4962b87e509c9aeedb35cd6a4b0434.tar.bz2 | |
Move the declarative ui destroyed handling
Otherwise, the qWarning will be bogus.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 4 |
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; |