Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

2 files changed, 18 insertions, 1 deletions

diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index b5bf972..d27aced 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -1089,6 +1089,23 @@ void QDeclarativeCompiler::genObjectBody(QDeclarativeParser::Object *obj)
         fetch.line = prop->location.start.line;
         output->bytecode << fetch;
 
+        if (!prop->value->metadata.isEmpty()) {
+            QDeclarativeInstruction meta;
+            meta.type = QDeclarativeInstruction::StoreMetaObject;
+            meta.line = 0;
+            meta.storeMeta.data = output->indexForByteArray(prop->value->metadata);
+            meta.storeMeta.aliasData = output->indexForByteArray(prop->value->synthdata);
+            meta.storeMeta.propertyCache = output->propertyCaches.count();
+            // ### Surely the creation of this property cache could be more efficient
+            QDeclarativePropertyCache *propertyCache =
+                enginePrivate->cache(prop->value->metaObject()->superClass())->copy();
+            propertyCache->append(engine, prop->value->metaObject(), QDeclarativePropertyCache::Data::NoFlags,
+                                  QDeclarativePropertyCache::Data::IsVMEFunction);
+
+            output->propertyCaches << propertyCache;
+            output->bytecode << meta;
+        }
+
         genObjectBody(prop->value);
 
         QDeclarativeInstruction pop;
diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp
index 13e9c26..7aea7cb 100644
--- a/src/declarative/qml/qdeclarativevmemetaobject.cpp
+++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp
@@ -381,7 +381,7 @@ QDeclarativeVMEMetaObject::QDeclarativeVMEMetaObject(QObject *obj,
                                                      const QMetaObject *other, 
                                                      const QDeclarativeVMEMetaData *meta,
                                                      QDeclarativeCompiledData *cdata)
-: object(obj), compiledData(cdata), ctxt(QDeclarativeData::get(obj)->outerContext), 
+: object(obj), compiledData(cdata), ctxt(QDeclarativeData::get(obj, true)->outerContext),
   metaData(meta), data(0), methods(0), parent(0)
 {
     compiledData->addref();