summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlcompiler.cpp
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-09-03 00:54:01 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-09-03 00:54:01 (GMT)
commit46440f4549814ac0025eaf4b527a4c35afd6258c (patch)
tree18480680359cab2cac760bb779d43da8aac0d094 /src/declarative/qml/qmlcompiler.cpp
parentc452c44d8cee138dcdd62f8c0f0db48b4ada5c40 (diff)
parent8ac9c707306f0eb8804310f47894d4723e190bce (diff)
downloadQt-46440f4549814ac0025eaf4b527a4c35afd6258c.zip
Qt-46440f4549814ac0025eaf4b527a4c35afd6258c.tar.gz
Qt-46440f4549814ac0025eaf4b527a4c35afd6258c.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlcompiler.cpp')
-rw-r--r--src/declarative/qml/qmlcompiler.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index c411b8d..b8e9d47 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -642,6 +642,8 @@ void QmlCompiler::compileTree(Object *tree)
def.type = QmlInstruction::SetDefault;
output->bytecode << def;
+ output->imports = unit->imports;
+
if (tree->metatype)
static_cast<QMetaObject &>(output->root) = *tree->metaObject();
else