diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-05-04 12:22:32 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-05-04 12:22:32 (GMT) |
| commit | df54401470007cd4970b3ca8409edc9c4dcd7abf (patch) | |
| tree | 5c436e2d2179219041fc11fe80e2600f3410560f /src | |
| parent | 6df2e157391dd812ee8b71c2373411f2580117d1 (diff) | |
| parent | 225942d32c358386de7c869ad3363bfdc990fef2 (diff) | |
| download | Qt-df54401470007cd4970b3ca8409edc9c4dcd7abf.zip Qt-df54401470007cd4970b3ca8409edc9c4dcd7abf.tar.gz Qt-df54401470007cd4970b3ca8409edc9c4dcd7abf.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qmldom.cpp | 10 |
1 files changed, 2 insertions, 8 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(); } |