From 94382009d4cc40641dc06f3e25b3376fede1932b Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Wed, 23 Sep 2009 22:47:07 +1000 Subject: Only compile time register synthesized objects --- src/declarative/qml/qmlcompiler.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index c192c50..02cd813 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -645,12 +645,10 @@ void QmlCompiler::compileTree(Object *tree) output->imports = unit->imports; - if (tree->metatype) { - static_cast(output->root) = *tree->metaObject(); + Q_ASSERT(tree->metatype); + static_cast(output->root) = *tree->metaObject(); + if (!tree->metadata.isEmpty()) QmlEnginePrivate::get(engine)->registerCompositeType(output); - } else { - static_cast(output->root) = *output->types.at(tree->type).metaObject(); - } } bool QmlCompiler::buildObject(Object *obj, const BindingContext &ctxt) -- cgit v0.12