diff options
| author | hjk <hjk@qt.io> | 2022-07-14 13:37:12 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2022-07-14 12:41:10 +0000 |
| commit | 3007b990e5f940bae26b618e398c3ee66998b558 (patch) | |
| tree | 2ff3d68fa0fe90f207e902f8c7042a7834b99869 | |
| parent | 4ff4d2b6e9ac755096182dafe565ecac6c62f426 (diff) | |
| download | qt-creator-3007b990e5f940bae26b618e398c3ee66998b558.tar.gz | |
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 <eike.ziller@qt.io>
| -rw-r--r-- | src/plugins/debugger/debuggerengine.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index ffff03082e..eeaeb265ea 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); |