summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlcompiler.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-07-24 07:01:17 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-07-24 07:01:17 (GMT)
commit3b6ac3b45a333815b097603c93bb38d97782826e (patch)
tree28b3b17179d4b5ce2afbbb323914196105dfaeca /src/declarative/qml/qmlcompiler.cpp
parentd150ada7c985f066e9c59571ce3db2bc6494ca08 (diff)
downloadQt-3b6ac3b45a333815b097603c93bb38d97782826e.zip
Qt-3b6ac3b45a333815b097603c93bb38d97782826e.tar.gz
Qt-3b6ac3b45a333815b097603c93bb38d97782826e.tar.bz2
Add the fully-qualified type name to the DOM (via QmlParser::Object)
QML-defined ones are still defined by their URL, not a qualified name.
Diffstat (limited to 'src/declarative/qml/qmlcompiler.cpp')
-rw-r--r--src/declarative/qml/qmlcompiler.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 2e8666d..7e483cd 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -628,6 +628,8 @@ bool QmlCompiler::buildObject(Object *obj, const BindingContext &ctxt)
if (tr.component)
obj->url = tr.component->url();
+ if (tr.type)
+ obj->typeName = tr.type->qmlTypeName();
// This object is a "Component" element
if (obj->metatype == &QmlComponent::staticMetaObject) {
@@ -1714,7 +1716,7 @@ bool QmlCompiler::buildPropertyObjectAssignment(QmlParser::Property *prop,
QmlParser::Object *root = v->object;
QmlParser::Object *component = new QmlParser::Object;
component->type = componentTypeRef();
- component->typeName = "Component";
+ component->typeName = "Qt/4.6/Component";
component->metatype = &QmlComponent::staticMetaObject;
component->location = root->location;
QmlParser::Value *componentValue = new QmlParser::Value;