diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-14 06:16:07 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-14 06:16:59 (GMT) |
| commit | e52a73d8c74576e267dcc59d42247bd14131daaf (patch) | |
| tree | f23bd7a9cc5d6163a9807f43237c21c7f644fe50 /src/declarative/qml/qdeclarativeengine.cpp | |
| parent | 5a8b5b892441a65319e39c1a8f305cf0b49edf17 (diff) | |
| download | Qt-e52a73d8c74576e267dcc59d42247bd14131daaf.zip Qt-e52a73d8c74576e267dcc59d42247bd14131daaf.tar.gz Qt-e52a73d8c74576e267dcc59d42247bd14131daaf.tar.bz2 | |
Reduce warnings at shutdown
QTBUG-9799
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 8462c65..f621af5 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -851,6 +851,9 @@ void QDeclarativeDeclarativeData::destroyed(QObject *object) if (propertyCache) propertyCache->release(); + if (ownContext) + context->destroy(); + QDeclarativeGuard<QObject> *guard = guards; while (guard) { QDeclarativeGuard<QObject> *g = guard; @@ -861,9 +864,6 @@ void QDeclarativeDeclarativeData::destroyed(QObject *object) g->objectDestroyed(object); } - if (ownContext) - context->destroy(); - if (scriptValue) delete scriptValue; |