Make sure we pass through a line number for evaluating bindings.

Also, don't convert URL to string each time we call evaluate.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp
index ea0e9aa..e88766c 100644
--- a/src/declarative/qml/qmlexpression.cpp
+++ b/src/declarative/qml/qmlexpression.cpp
@@ -257,7 +257,7 @@ QVariant QmlExpressionPrivate::evalQtScript()
         QmlRewrite::RewriteBinding rewriteBinding;
 
         const QString code = rewriteBinding(expression);
-        expressionFunction = scriptEngine->evaluate(code, fileName.toString(), line);
+        expressionFunction = scriptEngine->evaluate(code, fileName, line);
         expressionFunctionValid = true;
     }
 
@@ -421,7 +421,7 @@ void QmlExpression::setTrackChange(bool trackChange)
 void QmlExpression::setSourceLocation(const QUrl &fileName, int line)
 {
     Q_D(QmlExpression);
-    d->fileName = fileName;
+    d->fileName = fileName.toString();
     d->line = line;
 }