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

Debugger: Load dumpers from the device that runs gdb

Browse Source 
... not from the device of the inferior.

Amends 12bc192422.

Change-Id: Ief34d1765d48e87a9098522bafb4b419a857c42e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2022-07-14 13:37:12 +02:00
parent 4ff4d2b6e9
commit 3007b990e5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/debugger/debuggerengine.cpp
View File

@@ -1060,10 +1060,12 @@ void DebuggerEngine::setRunId(const QString &id)
void DebuggerEngine::setRunTool(DebuggerRunTool *runTool) void DebuggerEngine::setRunTool(DebuggerRunTool *runTool)
{ {
d->m_device = runTool->device(); d->m_device = runTool->device();
QTC_ASSERT(d->m_device, d->m_device = DeviceManager::deviceForPath(
d->m_runParameters.inferior.command.executable())); IDevice::ConstPtr debuggerDevice =
if (QTC_GUARD(d->m_device)) DeviceManager::deviceForPath(d->m_runParameters.debugger.command.executable());
d->m_runParameters.dumperPath = d->m_device->debugDumperPath(); if (QTC_GUARD(debuggerDevice))
d->m_runParameters.dumperPath = debuggerDevice->debugDumperPath();
d->m_terminalRunner = runTool->terminalRunner(); d->m_terminalRunner = runTool->terminalRunner();
validateRunParameters(d->m_runParameters); validateRunParameters(d->m_runParameters);