aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlvme.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-07-03 16:44:55 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-05 09:47:01 +0200
commitfe6ec7bcc17f88ab1aca5a7934d047456354c942 (patch)
tree61e722685a2bb6596a3eaa9f00526a5271f9cc68 /src/qml/qml/qqmlvme.cpp
parenta083ea8a34cad4feebcdadea33775ef6501ab884 (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/qqmlvme.cpp')
-rw-r--r--src/qml/qml/qqmlvme.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp
index f7390794ea..e4a996fac6 100644
--- a/src/qml/qml/qqmlvme.cpp
+++ b/src/qml/qml/qqmlvme.cpp
@@ -759,7 +759,8 @@ QObject *QQmlVME::run(QList<QQmlError> *errors,
new QQmlBoundSignalExpression(target, instr.signalIndex,
CTXT, context, PRIMITIVES.at(instr.value),
COMP->name, instr.line, instr.column,
- PRIMITIVES.at(instr.handlerName));
+ PRIMITIVES.at(instr.handlerName),
+ PRIMITIVES.at(instr.parameters));
bs->takeExpression(expr);
QML_END_INSTR(StoreSignal)