From e78f456083a8784812af4ae55542000384e6e0a6 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 7 Oct 2021 16:58:25 +0200 Subject: [PATCH] Debugger: Use MacroExpander from RunControl instead from Kit Kit is just a subset. Change-Id: I9ddfbfeaa5eadaa2e9a1d9a4a3409c6cf8a9658e Reviewed-by: David Schulz --- src/plugins/debugger/debuggerengine.h | 2 +- src/plugins/debugger/debuggerruncontrol.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index 8611e4668d6..2099bc2f959 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -195,7 +195,7 @@ public: bool isCppDebugging() const; bool isNativeMixedDebugging() const; - Utils::MacroExpander *macroExpander = nullptr; + const Utils::MacroExpander *macroExpander = nullptr; Utils::optional exitCode = {}; diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index ffece207088..8b92c7d31dc 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -885,7 +885,7 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, AllowTerminal allowTerm QTC_ASSERT(kit, return); m_runParameters.sysRoot = SysRootKitAspect::sysRoot(kit); - m_runParameters.macroExpander = kit->macroExpander(); + m_runParameters.macroExpander = runControl->macroExpander(); m_runParameters.debugger = DebuggerKitAspect::runnable(kit); m_runParameters.cppEngineType = DebuggerKitAspect::engineType(kit);