diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-01 08:48:41 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-03 13:22:25 +0200 |
| commit | 06eaeb0ac8d861cf3e60b11a8fbbabdeef1d6759 (patch) | |
| tree | 825fb27485c376d0b83e8dfbcd20c852f2dd525c /src/qml/qml/qqmlvme.cpp | |
| parent | b30657647a7f816a2945302b3569b882d7ac6b72 (diff) | |
Get rid of the signal expression rewriter
This replaces the entire rewriter with more or less:
expressionToEval = "(function(<named params here>) { " + expr + " } )"
This also fixes crashes at run-time when the signal rewriter was
executed from the loader thread and tried to use a v4 identifier
hash with the same engine that's also in the main thread.
Change-Id: Ib1e4927d330706a593411fbff64ed3da1e23d0e0
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvme.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvme.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp index cde16e885d..f7390794ea 100644 --- a/src/qml/qml/qqmlvme.cpp +++ b/src/qml/qml/qqmlvme.cpp @@ -757,9 +757,9 @@ QObject *QQmlVME::run(QList<QQmlError> *errors, QQmlBoundSignal *bs = new QQmlBoundSignal(target, instr.signalIndex, target, engine); QQmlBoundSignalExpression *expr = new QQmlBoundSignalExpression(target, instr.signalIndex, - CTXT, context, DATAS.at(instr.value), - true, COMP->name, instr.line, instr.column); - expr->setParameterCountForJS(instr.parameterCount); + CTXT, context, PRIMITIVES.at(instr.value), + COMP->name, instr.line, instr.column, + PRIMITIVES.at(instr.handlerName)); bs->takeExpression(expr); QML_END_INSTR(StoreSignal) |