diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-03 16:44:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-05 09:47:01 +0200 |
| commit | fe6ec7bcc17f88ab1aca5a7934d047456354c942 (patch) | |
| tree | 61e722685a2bb6596a3eaa9f00526a5271f9cc68 /src/qml/qml/qqmlboundsignal_p.h | |
| parent | a083ea8a34cad4feebcdadea33775ef6501ab884 (diff) | |
Fix regression in tst_qqmlecmascript::signalAssignment
Detect errors in the signal declaration already at compile time, re-introducing
the earlier code in qqmlcompiler.cpp that checked that. This also means that
the parameter string construction can be done once for each signal and not for
each handler.
Change-Id: Icf6242a793939466bbc44d43bf041281164ad1b6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlboundsignal_p.h')
| -rw-r--r-- | src/qml/qml/qqmlboundsignal_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h index 7d3adb17b1..ffb3d06770 100644 --- a/src/qml/qml/qqmlboundsignal_p.h +++ b/src/qml/qml/qqmlboundsignal_p.h @@ -72,7 +72,8 @@ public: QQmlBoundSignalExpression(QObject *target, int index, QQmlContextData *ctxt, QObject *scope, const QString &expression, const QString &fileName, quint16 line, quint16 column, - const QString &handlerName = QString()); + const QString &handlerName = QString(), + const QString ¶meterString = QString()); // "inherited" from QQmlJavaScriptExpression. @@ -99,6 +100,7 @@ private: QV4::PersistentValue m_v8function; QString m_handlerName; + QString m_parameterString; //once m_v8function is valid, we clear expression and //extract it from m_v8function if needed. QString m_expression; //only used when expression needs to be rewritten |