From 3007b990e5f940bae26b618e398c3ee66998b558 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 14 Jul 2022 13:37:12 +0200 Subject: [PATCH] Debugger: Load dumpers from the device that runs gdb ... not from the device of the inferior. Amends 12bc192422c75. Change-Id: Ief34d1765d48e87a9098522bafb4b419a857c42e Reviewed-by: Eike Ziller --- src/plugins/debugger/debuggerengine.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index ffff03082e1..eeaeb265ea5 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -1060,10 +1060,12 @@ void DebuggerEngine::setRunId(const QString &id) void DebuggerEngine::setRunTool(DebuggerRunTool *runTool) { d->m_device = runTool->device(); - QTC_ASSERT(d->m_device, d->m_device = DeviceManager::deviceForPath( - d->m_runParameters.inferior.command.executable())); - if (QTC_GUARD(d->m_device)) - d->m_runParameters.dumperPath = d->m_device->debugDumperPath(); + + IDevice::ConstPtr debuggerDevice = + DeviceManager::deviceForPath(d->m_runParameters.debugger.command.executable()); + if (QTC_GUARD(debuggerDevice)) + d->m_runParameters.dumperPath = debuggerDevice->debugDumperPath(); + d->m_terminalRunner = runTool->terminalRunner(); validateRunParameters(d->m_runParameters);