diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-11-15 17:14:48 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-11-21 10:48:02 +0000 |
| commit | eac0ab4974454af5a4b7d2c77c13025fba9be597 (patch) | |
| tree | 8c03f71994142f433ac15bcd011cddaf8b93ca7c /src/plugins/debugger/qml/qmlengine.cpp | |
| parent | 5170dd08585d40952a83e00571072fe32432a2fd (diff) | |
Debugger: Add multi-engine support for QML inspector
The engines are listed as virtual root items for their contents. This
way, when we need an engineID we can walk up the tree of watch items and
the last valid one will be the engine.
Fixes: QTCREATORBUG-21486
Change-Id: Ib110457dc65523c1e2b75aa073f6cd399bbc9532
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/debugger/qml/qmlengine.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlengine.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 567a3852e8..8e03b42c67 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -1040,7 +1040,9 @@ void QmlEngine::executeDebuggerCommand(const QString &command) if (d->unpausedEvaluate) { d->evaluate(command, contextId, CB(d->handleExecuteDebuggerCommand)); } else { - quint32 queryId = d->inspectorAgent.queryExpressionResult(contextId, command); + quint32 queryId = d->inspectorAgent.queryExpressionResult( + contextId, command, + d->inspectorAgent.engineId(watchHandler()->watchItem(currentIndex))); if (queryId) { d->queryIds.append(queryId); } else { |