From b425fbbd0ae9ff00f60af222bca08096719843f4 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 7 Jun 2013 23:21:27 +0200 Subject: Fix qqmlecmascript::enums and nonNotifyable In the v8 bindings in expressionIdentifier we used to print the url with line number and only in the base class we printed the expression itself. With qv8bindings.cpp gone, we can do that now in the base class, as expected by the test. Adjusted the test also by columns. Change-Id: I8d532d21baf5bf2fbfcca56c2657a1d65025fe84 Reviewed-by: Lars Knoll --- src/qml/qml/qqmlbinding.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/qml/qqmlbinding.cpp') diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp index 79b1b2efc5..eff17ddd9a 100644 --- a/src/qml/qml/qqmlbinding.cpp +++ b/src/qml/qml/qqmlbinding.cpp @@ -301,7 +301,7 @@ QString QQmlBinding::expressionIdentifier(QQmlJavaScriptExpression *e) { QQmlBinding *This = static_cast(e); - return QLatin1Char('"') + QString::fromUtf8(This->m_expression) + QLatin1Char('"'); + return This->m_url + QLatin1Char(':') + QString::number(This->m_lineNumber) + QLatin1Char(':') + QString::number(This->m_columnNumber); } void QQmlBinding::expressionChanged(QQmlJavaScriptExpression *e) -- cgit v1.2.3