Debugger: Restore expression evaluation through QML inspector

You can now interact with QML objects selected with the "select" tool
again, when unpausedEvaluate is off.

Change-Id: If6b4a55193a8949b2e3048fe78443c5df6710885
Task-number: QTCREATORBUG-16300
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-05-23 11:35:44 +02:00
parent 278819f8fd
commit e6e2c1771b

View File

@@ -1125,8 +1125,15 @@ void QmlEngine::executeDebuggerCommand(const QString &command, DebuggerLanguages
} else if (d->unpausedEvaluate) {
d->evaluate(command, CB(d->handleExecuteDebuggerCommand));
} else {
d->engine->showMessage(_("The application has to be stopped in a breakpoint in order to "
"evaluate expressions"), ConsoleOutput);
QModelIndex currentIndex = inspectorView()->currentIndex();
quint32 queryId = d->inspectorAgent.queryExpressionResult(
watchHandler()->watchItem(currentIndex)->id, command);
if (queryId) {
d->queryIds.append(queryId);
} else {
d->engine->showMessage(_("The application has to be stopped in a breakpoint in order to"
" evaluate expressions"), ConsoleOutput);
}
}
}