diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-03 23:39:52 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-03 23:39:52 (GMT) |
| commit | 651f4336392f86cb5820e3e3cccdc56ec3a0efe8 (patch) | |
| tree | 4435c8348f40a4a2be184063cc5a5197f61a650e /src/declarative/qml/qdeclarativedeclarativedata_p.h | |
| parent | f53ac4f7617bfdefcb62e9b27ee6bf1a91a7ed13 (diff) | |
| parent | 5ac068602871b78eb4b58634d58e6b8898acbf8d (diff) | |
| download | Qt-651f4336392f86cb5820e3e3cccdc56ec3a0efe8.zip Qt-651f4336392f86cb5820e3e3cccdc56ec3a0efe8.tar.gz Qt-651f4336392f86cb5820e3e3cccdc56ec3a0efe8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativedeclarativedata_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativedeclarativedata_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativedeclarativedata_p.h b/src/declarative/qml/qdeclarativedeclarativedata_p.h index a7a73bc..ae40130 100644 --- a/src/declarative/qml/qdeclarativedeclarativedata_p.h +++ b/src/declarative/qml/qdeclarativedeclarativedata_p.h @@ -120,6 +120,11 @@ public: template<class T> void QDeclarativeGuard<T>::addGuard() { + if (QObjectPrivate::get(o)->wasDeleted) { + if (prev) remGuard(); + return; + } + QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(o, true); next = data->guards; if (next) reinterpret_cast<QDeclarativeGuard<T> *>(next)->prev = &next; |