From 2ef17050f740b4e0debc43f66f26f419b317b7ab Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Wed, 3 Mar 2010 15:15:47 +1000
Subject: QDeclarativeGuard should handle objects being deleted

---
 src/declarative/qml/qdeclarativedeclarativedata_p.h | 5 +++++
 1 file changed, 5 insertions(+)

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;
-- 
cgit v0.12