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

Debugger: Remove DebuggerRunTool::setInferiorDevice()

Browse Source 
Handled by the device implicit in FilePath nowadays.

Change-Id: I45b0e1b03de486df678e239143e2bdd995bee380
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2022-05-25 09:11:51 +02:00
parent 7d848364ff
commit fc7634d730
4 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -1736,8 +1736,7 @@ RunControl *DebuggerPluginPrivate::attachToRunningProcess(Kit *kit,
runControl->setDisplayName(tr("Process %1").arg(processInfo.processId)); runControl->setDisplayName(tr("Process %1").arg(processInfo.processId));
auto debugger = new DebuggerRunTool(runControl); auto debugger = new DebuggerRunTool(runControl);
debugger->setAttachPid(ProcessHandle(processInfo.processId)); debugger->setAttachPid(ProcessHandle(processInfo.processId));
debugger->setInferiorExecutable(FilePath::fromString(processInfo.executable)); debugger->setInferiorExecutable(device->filePath(processInfo.executable));
debugger->setInferiorDevice(device);
debugger->setStartMode(AttachToLocalProcess); debugger->setStartMode(AttachToLocalProcess);
debugger->setCloseMode(DetachAtClose); debugger->setCloseMode(DetachAtClose);
debugger->setContinueAfterAttach(contAfterAttach); debugger->setContinueAfterAttach(contAfterAttach);

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

@@ -395,11 +395,6 @@ void DebuggerRunTool::setInferiorEnvironment(const Utils::Environment &env)
m_runParameters.inferior.environment = env; m_runParameters.inferior.environment = env;
} }
void DebuggerRunTool::setInferiorDevice(IDevice::ConstPtr device)
{
m_runParameters.inferior.device = device;
}
void DebuggerRunTool::setRunControlName(const QString &name) void DebuggerRunTool::setRunControlName(const QString &name)
{ {
m_runParameters.displayName = name; m_runParameters.displayName = name;

1
src/plugins/debugger/debuggerruncontrol.h
View File

@@ -76,7 +76,6 @@ public:
void setInferior(const ProjectExplorer::Runnable &runnable); void setInferior(const ProjectExplorer::Runnable &runnable);
void setInferiorExecutable(const Utils::FilePath &executable); void setInferiorExecutable(const Utils::FilePath &executable);
void setInferiorEnvironment(const Utils::Environment &env); // Used by GammaRay plugin void setInferiorEnvironment(const Utils::Environment &env); // Used by GammaRay plugin
void setInferiorDevice(ProjectExplorer::IDeviceConstPtr device); // Used by cdbengine
void setRunControlName(const QString &name); void setRunControlName(const QString &name);
void setStartMessage(const QString &msg); void setStartMessage(const QString &msg);
void addQmlServerInferiorCommandLineArgumentIfNeeded(); void addQmlServerInferiorCommandLineArgumentIfNeeded();

1
src/plugins/valgrind/memchecktool.cpp
View File

@@ -1672,7 +1672,6 @@ void HeobData::processFinished()
auto debugger = new DebuggerRunTool(m_runControl); auto debugger = new DebuggerRunTool(m_runControl);
debugger->setAttachPid(ProcessHandle(m_data[1])); debugger->setAttachPid(ProcessHandle(m_data[1]));
debugger->setRunControlName(tr("Process %1").arg(m_data[1])); debugger->setRunControlName(tr("Process %1").arg(m_data[1]));
debugger->setInferiorDevice(DeviceKitAspect::device(m_kit));
debugger->setStartMode(AttachToLocalProcess); debugger->setStartMode(AttachToLocalProcess);
debugger->setCloseMode(DetachAtClose); debugger->setCloseMode(DetachAtClose);
debugger->setContinueAfterAttach(true); debugger->setContinueAfterAttach(true);