summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlengine.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-06-11 23:46:39 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-06-11 23:46:39 (GMT)
commit74c18979b927ba3dd82ed3f5ca362428c61c2675 (patch)
tree9d3588bf393535034b6af21d6ba9c7201bc22ac5 /src/declarative/qml/qmlengine.cpp
parentf10791eb1c45b090f60a2c2ecca3cc5fd237278e (diff)
downloadQt-74c18979b927ba3dd82ed3f5ca362428c61c2675.zip
Qt-74c18979b927ba3dd82ed3f5ca362428c61c2675.tar.gz
Qt-74c18979b927ba3dd82ed3f5ca362428c61c2675.tar.bz2
More explicit QUrl <-> QString conversion.
Diffstat (limited to 'src/declarative/qml/qmlengine.cpp')
-rw-r--r--src/declarative/qml/qmlengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 2c1d324..23ab744 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -1128,7 +1128,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();