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

Debugger: Remove one use of Runnable::device

Browse Source 
Change-Id: I46a004b9536e3b32f3fd620b86e39722c7ddcb6d
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2022-05-25 13:40:23 +02:00
parent 807251f57f
commit d663986ef1
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,6 @@
#include "debuggerruncontrol.h" #include "debuggerruncontrol.h"
#include "debuggertooltipmanager.h" #include "debuggertooltipmanager.h"
#include "analyzer/analyzermanager.h"
#include "breakhandler.h" #include "breakhandler.h"
#include "disassembleragent.h" #include "disassembleragent.h"
#include "localsandexpressionswindow.h" #include "localsandexpressionswindow.h"
@@ -54,7 +53,6 @@
#include "watchutils.h" #include "watchutils.h"
#include "watchwindow.h" #include "watchwindow.h"
#include "debugger/shared/peutils.h" #include "debugger/shared/peutils.h"
#include "console/console.h"
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
@@ -66,7 +64,7 @@
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/progressmanager/futureprogress.h> #include <coreplugin/progressmanager/futureprogress.h>
#include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/devicesupport/devicemanager.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/taskhub.h> #include <projectexplorer/taskhub.h>
@@ -1060,11 +1058,10 @@ void DebuggerEngine::setRunId(const QString &id)
void DebuggerEngine::setRunTool(DebuggerRunTool *runTool) void DebuggerEngine::setRunTool(DebuggerRunTool *runTool)
{ {
RunControl *runControl = runTool->runControl(); d->m_device = runTool->device();
d->m_device = runControl->device(); QTC_ASSERT(d->m_device, d->m_device = DeviceManager::deviceForPath(
if (!d->m_device) d->m_runParameters.inferior.command.executable()));
d->m_device = d->m_runParameters.inferior.device; if (QTC_GUARD(d->m_device))
if (d->m_device)
d->m_runParameters.dumperPath = d->m_device->debugDumperPath(); d->m_runParameters.dumperPath = d->m_device->debugDumperPath();
d->m_terminalRunner = runTool->terminalRunner(); d->m_terminalRunner = runTool->terminalRunner();