diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-01-13 04:25:55 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-01-13 04:25:55 (GMT) |
| commit | dfaf68593702f191ea66920074c96ca2244a973e (patch) | |
| tree | a6c3439af36df24a2d441a3f97718004530559c0 /src/declarative/qml/qmlengine.cpp | |
| parent | 4accb53cc2f9e2e89fda91a20e3c0503cf10aad0 (diff) | |
| parent | 8f1fb137cb47951dc67409372a6763ddb17d65ca (diff) | |
| download | Qt-dfaf68593702f191ea66920074c96ca2244a973e.zip Qt-dfaf68593702f191ea66920074c96ca2244a973e.tar.gz Qt-dfaf68593702f191ea66920074c96ca2244a973e.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlengine.cpp')
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index cdae172..b5e7c2d 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -320,7 +320,8 @@ QmlWorkerScriptEngine *QmlEnginePrivate::getWorkerScriptEngine() \code QmlEngine engine; - QmlComponent component(&engine, "import Qt 4.6\nText { text: \"Hello world!\" }", QUrl()); + QmlComponent component(&engine); + component.setData("import Qt 4.6\nText { text: \"Hello world!\" }", QUrl()); QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem *>(component.create()); //add item to view, etc @@ -703,7 +704,8 @@ QScriptValue QmlEnginePrivate::createQmlObject(QScriptContext *ctxt, QScriptEngi if(!parentArg) return engine->nullValue(); - QmlComponent component(activeEngine, qml.toUtf8(), url); + QmlComponent component(activeEngine); + component.setData(qml.toUtf8(), url); if(component.isError()) { QList<QmlError> errors = component.errors(); |