Add Component.onDestruction attached property

This property complements Component.onCompleted.  It is emitted before
the destruction actually begins (for the most part) so the objects are
still alive and accessible.

The QtObject.onDestroyed signal is now blocked as it never really worked
properly anyway.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h
index 5d26e7e..77a6d94 100644
--- a/src/declarative/qml/qdeclarativecontext_p.h
+++ b/src/declarative/qml/qdeclarativecontext_p.h
@@ -106,6 +106,7 @@ public:
     static QObject *context_at(QDeclarativeListProperty<QObject> *, int);
 };
 
+class QDeclarativeComponentAttached;
 class QDeclarativeGuardedContextData;
 class QDeclarativeContextData
 {
@@ -113,6 +114,7 @@ public:
     QDeclarativeContextData();
     QDeclarativeContextData(QDeclarativeContext *);
     void destroy();
+    void invalidate();
 
     inline bool isValid() const {
         return engine && (!isInternal || !contextObject || !QObjectPrivate::get(contextObject)->wasDeleted);
@@ -123,7 +125,6 @@ public:
     QDeclarativeEngine *engine;
 
     void setParent(QDeclarativeContextData *);
-    void invalidateEngines();
     void refreshExpressions();
 
     void addObject(QObject *);
@@ -194,6 +195,10 @@ public:
     // Linked contexts. this owns linkedContext.
     QDeclarativeContextData *linkedContext;
 
+    // Linked list of uses of the Component attached property in this
+    // context
+    QDeclarativeComponentAttached *componentAttached;
+
     QString findObjectId(const QObject *obj) const;
 
     static QDeclarativeContextData *get(QDeclarativeContext *context) {