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

Debugger: Fix core file loading

Browse Source 
Amends 99e3635ef.

Change-Id: I0146416af32a6464765de008630ca1a1a05231a7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2018-08-16 16:17:18 +02:00
parent 3b5ecac238
commit 7866f62892
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -903,17 +903,16 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit, bool allowTer
m_runParameters.sysRoot = SysRootKitInformation::sysRoot(kit).toString();
m_runParameters.macroExpander = kit->macroExpander();
m_runParameters.debugger = DebuggerKitInformation::runnable(kit);
m_runParameters.cppEngineType = DebuggerKitInformation::engineType(kit);
if (QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(kit))
m_runParameters.qtPackageSourceLocation = qtVersion->qtPackageSourcePath().toString();
if (auto aspect = runConfig ? runConfig->extraAspect<DebuggerRunConfigurationAspect>() : nullptr) {
if (aspect->useCppDebugger())
m_runParameters.cppEngineType = DebuggerKitInformation::engineType(kit);
if (!aspect->useCppDebugger())
m_runParameters.cppEngineType = NoEngineType;
m_runParameters.isQmlDebugging = aspect->useQmlDebugger();
m_runParameters.multiProcess = aspect->useMultiProcess();
} else if (m_runParameters.isCppDebugging()) {
m_runParameters.cppEngineType = DebuggerKitInformation::engineType(kit);
}
m_runParameters.inferior = runnable();