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/debugger/qqmlenginedebugservice.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/debugger/qqmlenginedebugservice.cpp')
| -rw-r--r-- | src/qml/debugger/qqmlenginedebugservice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/debugger/qqmlenginedebugservice.cpp b/src/qml/debugger/qqmlenginedebugservice.cpp index 65f7419ee3..2b013129ce 100644 --- a/src/qml/debugger/qqmlenginedebugservice.cpp +++ b/src/qml/debugger/qqmlenginedebugservice.cpp @@ -623,7 +623,7 @@ bool QQmlEngineDebugService::setBinding(int objectId, } else if (hasValidSignal(object, propertyName)) { QQmlBoundSignalExpression *qmlExpression = new QQmlBoundSignalExpression(object, QQmlPropertyPrivate::get(property)->signalIndex(), QQmlContextData::get(context), object, expression.toString(), - false, filename, line, column); + filename, line, column); QQmlPropertyPrivate::takeSignalExpression(property, qmlExpression); } else if (property.isProperty()) { QQmlBinding *binding = new QQmlBinding(expression.toString(), object, QQmlContextData::get(context), filename, line, column);; |