Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

3 files changed, 4 insertions, 3 deletions

diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index f0473f5..9c9a7bd 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -2088,6 +2088,7 @@ void QmlCompiler::genBindingAssignment(QmlParser::Value *binding,
     store.assignBinding.value = dataRef;
     store.assignBinding.context = ref.bindingContext.stack;
     store.assignBinding.owner = ref.bindingContext.owner;
+    store.line = prop->location.end.line;
 
     output->bytecode << store;
 }
diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp
index 7394004..2c06efa 100644
--- a/src/declarative/qml/qmlexpression.cpp
+++ b/src/declarative/qml/qmlexpression.cpp
@@ -253,7 +253,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;
     }
 
@@ -417,7 +417,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;
 }
 
diff --git a/src/declarative/qml/qmlexpression_p.h b/src/declarative/qml/qmlexpression_p.h
index 7f086c2..cb89ce0 100644
--- a/src/declarative/qml/qmlexpression_p.h
+++ b/src/declarative/qml/qmlexpression_p.h
@@ -83,7 +83,7 @@ public:
     QObject *me;
     bool trackChange;
 
-    QUrl fileName;
+    QString fileName;
     int line;
 
     QVariant evalSSE(QmlBasicScript::CacheState &cacheState);