Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

2 files changed, 3 insertions, 9 deletions

diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
index cf0a2fb..f8cf194 100644
--- a/src/declarative/qml/qmldom.cpp
+++ b/src/declarative/qml/qmldom.cpp
@@ -154,12 +154,6 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data)
 
     d->error = QString();
 
-    QmlScriptParser parser;
-    if (!parser.parse(data)) {
-        d->error = parser.errorDescription();
-        return false;
-    }
-
     QmlCompiledComponent component;
     QmlCompiler compiler;
 
@@ -184,8 +178,8 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data)
     }
 
     if (td->data.tree()) {
-        component.dump(0, parser.tree());
-        d->root = parser.tree();
+        component.dump(0, td->data.tree());
+        d->root = td->data.tree();
         d->root->addref();
     }
 
diff --git a/tests/auto/declarative/qmldom/tst_qmldom.cpp b/tests/auto/declarative/qmldom/tst_qmldom.cpp
index 7e7e067..390e79a 100644
--- a/tests/auto/declarative/qmldom/tst_qmldom.cpp
+++ b/tests/auto/declarative/qmldom/tst_qmldom.cpp
@@ -63,7 +63,7 @@ void tst_qmldom::loadProperties()
 
 void tst_qmldom::loadChildObject()
 {
-    QByteArray qml = "Item { Item }";
+    QByteArray qml = "Item { Item {} }";
     //QByteArray qml = "<Item> <Item/> </Item>";
 
     QmlDomDocument document;