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, 6 insertions, 3 deletions

diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index f03ce20..5436227 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -1647,12 +1647,15 @@ QmlCompiledData &QmlCompiledData::operator=(const QmlCompiledData &other)
     return *this;
 }
 
-QObject *QmlCompiledData::TypeReference::createInstance() const
+QObject *QmlCompiledData::TypeReference::createInstance(QmlContext *ctxt) const
 {
     if(type) {
-        return type->create();
+        QObject *rv = type->create();
+        if(rv)
+            QmlEngine::setContextForObject(rv, ctxt);
+        return rv;
     } else if(component) {
-        return component->create(QmlContext::activeContext());
+        return component->create(ctxt);
     } else {
         return 0;
     }