Use QObject declarative data to store attached properties.

An element's qmlAttachedProperties() function will now only ever get called once
per object.

1 files changed, 2 insertions, 6 deletions

diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h
index aa0bf3e..3772885 100644
--- a/src/declarative/qml/qmlcontext_p.h
+++ b/src/declarative/qml/qmlcontext_p.h
@@ -44,6 +44,7 @@
 
 #include <qmlcontext.h>
 #include <private/qobject_p.h>
+#include <private/qmldeclarativedata_p.h>
 #include <qhash.h>
 #include <qscriptvalue.h>
 
@@ -82,12 +83,7 @@ public:
     };
     void addDefaultObject(QObject *, Priority);
 
-    class ContextData : public QDeclarativeData
-    {
-    public:
-        QmlContext *context;
-    };
-    ContextData contextData;
+    QmlSimpleDeclarativeData contextData;
 };
 QT_END_NAMESPACE