diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2010-03-03 07:00:26 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2010-03-03 07:00:26 (GMT) |
| commit | aebadf248a93458615a53b3480987f829aba0ee6 (patch) | |
| tree | 143b0c6ac542581c6fd53c9b332be64380d5189d /src | |
| parent | dba7eb104f7788fda36e8a2ecffc8f4c08ec1fae (diff) | |
| parent | 1340e99a83d64bda2c8d37b67ef2f60be7a706c4 (diff) | |
| download | Qt-aebadf248a93458615a53b3480987f829aba0ee6.zip Qt-aebadf248a93458615a53b3480987f829aba0ee6.tar.gz Qt-aebadf248a93458615a53b3480987f829aba0ee6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src')
| -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; |