Add some leading white space to generated code for QML signals.

Like this the column numbers in the generated code are correct. We rely
on the column numbers in quite a few places.

The alternative solution of extending the Javascript parser to add an
initial column offset would result in much more code and complexity.

const-casting the column number and adding to it after compiling would
be an option but as the column number may be saved in other places, too,
this is not desirable.

Task-number: QTBUG-37226
Change-Id: I0d11816d96ff4e7c756064646755a3e9874f9790
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index f7ece53121..a5e23978d7 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -188,7 +188,10 @@ void QQmlBoundSignalExpression::evaluate(void **a)
             Q_ASSERT(!m_extra.isNull());
             QString expression;
 
-            expression = QStringLiteral("(function ");
+            // Add some leading whitespace to account for the binding's column offset.
+            // It's 2 off because a, we start counting at 1 and b, the '(' below is not counted.
+            expression.fill(QChar(QChar::Space), qMax(m_extra->m_sourceLocation.column, (quint16)2) - 2);
+            expression += QStringLiteral("(function ");
             expression += m_extra->m_handlerName;
             expression += QLatin1Char('(');