Add a declarative data ptr to QObjectPrivate

This data ptr does not increase the size of the QObject, as we take advantage of space only used during destruction.  Currently this data is only used to store an object's QmlContext, but it will be used for more later.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index 966ef8a..b6d9173 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -253,7 +253,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
 #ifdef Q_ENABLE_PERFORMANCE_LOG
                 QFxCompilerTimer<QFxCompiler::InstrCreateObject> cc;
 #endif
-                QObject *o = types.at(instr.create.type).createInstance();
+                QObject *o = types.at(instr.create.type).createInstance(QmlContext::activeContext());
                 if(!o)
                     VME_EXCEPTION("Unable to create object of type" << types.at(instr.create.type).className);
 
@@ -276,6 +276,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
                 QObject *o = QmlMetaType::toQObject(v);
                 if(!o)
                     VME_EXCEPTION("Unable to create" << types.at(instr.create.type).className);
+                QmlEngine::setContextForObject(o, QmlContext::activeContext());
 
                 if(!stack.isEmpty()) {
                     QObject *parent = stack.top();