1 files changed, 8 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h
index 7a16179..77a6d94 100644
--- a/src/declarative/qml/qdeclarativecontext_p.h
+++ b/src/declarative/qml/qdeclarativecontext_p.h
@@ -55,7 +55,7 @@
 
 #include "qdeclarativecontext.h"
 
-#include "private/qdeclarativedeclarativedata_p.h"
+#include "private/qdeclarativedata_p.h"
 #include "private/qdeclarativeintegercache_p.h"
 #include "private/qdeclarativetypenamecache_p.h"
 #include "private/qdeclarativenotifier_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 *);
@@ -166,7 +167,7 @@ public:
     QDeclarativeAbstractExpression *expressions;
 
     // Doubly-linked list of objects that are owned by this context
-    QDeclarativeDeclarativeData *contextObjects;
+    QDeclarativeData *contextObjects;
 
     // Doubly-linked list of context guards (XXX merge with contextObjects)
     QDeclarativeGuardedContextData *contextGuards;
@@ -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) {