From b99059bfd6ee693617d5936857f40e49a5f7a4bd Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 21 Feb 2017 14:50:19 +0100 Subject: [PATCH] Debugger: Run fresh expression evaluator also in combined debugging doUpdateLocals() was called, but not re-implemented in the combined case. Task-number: QTCREATORBUG-17763 Change-Id: Id8c17ce0bda79cd61c57624aea5a05e4aad96c79 Reviewed-by: Christian Stenger --- src/plugins/debugger/qml/qmlcppengine.cpp | 5 +++++ src/plugins/debugger/qml/qmlcppengine.h | 1 + 2 files changed, 6 insertions(+) diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 458061e0809..479a45c075b 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -254,6 +254,11 @@ void QmlCppEngine::attemptBreakpointSynchronization() } } +void QmlCppEngine::doUpdateLocals(const UpdateParameters &up) +{ + m_activeEngine->doUpdateLocals(up); +} + bool QmlCppEngine::acceptsBreakpoint(Breakpoint bp) const { return m_cppEngine->acceptsBreakpoint(bp) diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h index 6fdd68ce831..bd3d48c053c 100644 --- a/src/plugins/debugger/qml/qmlcppengine.h +++ b/src/plugins/debugger/qml/qmlcppengine.h @@ -107,6 +107,7 @@ protected: void executeRunToFunction(const QString &functionName) override; void executeJumpToLine(const ContextData &data) override; void executeDebuggerCommand(const QString &command, DebuggerLanguages languages) override; + void doUpdateLocals(const UpdateParameters &up) override; void setupEngine() override; void setupInferior() override;