diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-16 01:03:37 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-16 01:03:37 (GMT) |
commit | 62c390d3990bd5c65c9710622198e653e8ac9050 (patch) | |
tree | 11a3943fa92a29dd5ba7b90e7bf3920d6435b7f8 /src/declarative/qml/qmlengine.cpp | |
parent | 19964b720d1e2c83bc1ffd60db870b07090866ad (diff) | |
parent | 364524ddf8dddddcbe86917ce2c0271223b78ce6 (diff) | |
download | Qt-62c390d3990bd5c65c9710622198e653e8ac9050.zip Qt-62c390d3990bd5c65c9710622198e653e8ac9050.tar.gz Qt-62c390d3990bd5c65c9710622198e653e8ac9050.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 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index edc76c2..a43b9b9 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -803,7 +803,7 @@ QmlEngine *QmlEngine::activeEngine() dynamically creates and returns objects when called from QtScript, and these objects are visual items in the QML tree. - \sa QmlEngine::newQObject() + \sa QScriptEngine::newQObject() */ QScriptValue QmlEngine::qmlScriptObject(QObject* object, QmlEngine* engine) { @@ -818,7 +818,7 @@ QScriptValue QmlEngine::qmlScriptObject(QObject* object, QmlEngine* engine) This function takes the URL of a QML file as its only argument. It returns a component object which can be used to create and load that QML file. - Example JavaScript is below, remember that QML files that might be loaded + Example QmlJS is below, remember that QML files that might be loaded over the network cannot be expected to be ready immediately. \code var component; @@ -860,6 +860,7 @@ QScriptValue QmlEngine::qmlScriptObject(QObject* object, QmlEngine* engine) } \endcode + \sa QmlComponent::createObject() */ QScriptValue QmlEngine::createComponent(QScriptContext *ctxt, QScriptEngine *engine) { @@ -1123,7 +1124,7 @@ QVariant QmlExpression::value() for (int i = context()->d_func()->scopeChain.size() - 1; i > -1; --i) { scriptEngine->currentContext()->pushScope(context()->d_func()->scopeChain.at(i)); } - QScriptValue svalue = scriptEngine->evaluate(expression(), d->fileName, d->line); + QScriptValue svalue = scriptEngine->evaluate(expression(), d->fileName.toString(), d->line); if (scriptEngine->hasUncaughtException()) { if (scriptEngine->uncaughtException().isError()){ QScriptValue exception = scriptEngine->uncaughtException(); |