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/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index b6d9173..62a0864 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -860,14 +860,10 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
 #endif
                 QObject *target = stack.top();
 
-                QmlAttachedPropertiesFunc attachFunc = 
-                    QmlMetaType::attachedPropertiesFunc(datas.at(instr.fetchAttached.idx));
-                if(!attachFunc) 
-                    VME_EXCEPTION("No such attached object" << primitives.at(instr.fetchAttached.idx));
+                QObject *qmlObject = qmlAttachedPropertiesObjectById(instr.fetchAttached.id, target);
 
-                QObject *qmlObject = attachFunc(target);
                 if(!qmlObject)
-                    VME_EXCEPTION("Internal error - unable to create attached object" << primitives.at(instr.fetchAttached.idx));
+                    VME_EXCEPTION("Unable to create attached object");
 
                 stack.push(qmlObject);
             }