diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-13 05:19:57 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-13 05:19:57 (GMT) |
| commit | 05380361e7318a3a6536ddec2f00e76ebf819009 (patch) | |
| tree | 50a0c39e441f41665ba0302d1cddc9b57ec92e4b /src/declarative/qml | |
| parent | 72094648438d8214dcaabddf4d94d9d7e346675a (diff) | |
| parent | 5220b879a19b4fa1e28829e724c1ad12e85566f4 (diff) | |
| download | Qt-05380361e7318a3a6536ddec2f00e76ebf819009.zip Qt-05380361e7318a3a6536ddec2f00e76ebf819009.tar.gz Qt-05380361e7318a3a6536ddec2f00e76ebf819009.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 9f5cafe..94e6771 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -327,11 +327,12 @@ Q_GLOBAL_STATIC(QDeclarativeEngineDebugServer, qmlEngineDebugServer); void QDeclarativePrivate::qdeclarativeelement_destructor(QObject *o) { QObjectPrivate *p = QObjectPrivate::get(o); - Q_ASSERT(p->declarativeData); - QDeclarativeData *d = static_cast<QDeclarativeData*>(p->declarativeData); - if (d->ownContext && d->context) { - d->context->destroy(); - d->context = 0; + if (p->declarativeData) { + QDeclarativeData *d = static_cast<QDeclarativeData*>(p->declarativeData); + if (d->ownContext && d->context) { + d->context->destroy(); + d->context = 0; + } } } |