feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Use MacroExpander from RunControl instead from Kit

Browse Source 
Kit is just a subset.

Change-Id: I9ddfbfeaa5eadaa2e9a1d9a4a3409c6cf8a9658e
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-10-07 16:58:25 +02:00
parent dfb5ab475e
commit e78f456083
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/debuggerengine.h
View File

@@ -195,7 +195,7 @@ public:
bool isCppDebugging() const; bool isCppDebugging() const;
bool isNativeMixedDebugging() const; bool isNativeMixedDebugging() const;
Utils::MacroExpander *macroExpander = nullptr; const Utils::MacroExpander *macroExpander = nullptr;
Utils::optional<int> exitCode = {}; Utils::optional<int> exitCode = {};

2
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -885,7 +885,7 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, AllowTerminal allowTerm
QTC_ASSERT(kit, return); QTC_ASSERT(kit, return);
m_runParameters.sysRoot = SysRootKitAspect::sysRoot(kit); m_runParameters.sysRoot = SysRootKitAspect::sysRoot(kit);
m_runParameters.macroExpander = kit->macroExpander(); m_runParameters.macroExpander = runControl->macroExpander();
m_runParameters.debugger = DebuggerKitAspect::runnable(kit); m_runParameters.debugger = DebuggerKitAspect::runnable(kit);
m_runParameters.cppEngineType = DebuggerKitAspect::engineType(kit); m_runParameters.cppEngineType = DebuggerKitAspect::engineType(kit);