aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/baremetal
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2023-08-16 19:24:06 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2023-08-17 07:44:34 +0000
commit121d73b30f9349c739ab972162b429b3de078a00 (patch)
tree97f583ca768b7493dd4146d09abb331b2eed1d95 /src/plugins/baremetal
parent123eb073caacae6548d083ce34a94848147a4254 (diff)
Utils: Rename ProjectExplorer::Runnable into Utils::ProcessRunData
Move it into Utils lib. Change-Id: I3b6c16d18439cabddf59afc03116f13c1970102c Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/baremetal')
-rw-r--r--src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp2
-rw-r--r--src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp8
-rw-r--r--src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
index 8bd2b3fdcc..802d691c68 100644
--- a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
@@ -153,7 +153,7 @@ bool GdbServerProvider::aboutToRun(DebuggerRunTool *runTool, QString &errorMessa
return false;
}
- Runnable inferior;
+ ProcessRunData inferior;
inferior.command.setExecutable(bin);
if (const auto argAspect = runControl->aspect<ArgumentsAspect>())
inferior.command.setArguments(argAspect->arguments);
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
index 951f0391ec..9b20bea548 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
@@ -192,7 +192,7 @@ bool UvscServerProvider::aboutToRun(DebuggerRunTool *runTool, QString &errorMess
const FilePath peripheralDescriptionFile = FilePath::fromString(m_deviceSelection.svd);
- Runnable inferior;
+ ProcessRunData inferior;
inferior.command.setExecutable(bin);
runTool->runParameters().peripheralDescriptionFile = peripheralDescriptionFile;
runTool->runParameters().uVisionProjectFilePath = projFilePath;
@@ -209,12 +209,12 @@ bool UvscServerProvider::aboutToRun(DebuggerRunTool *runTool, QString &errorMess
ProjectExplorer::RunWorker *UvscServerProvider::targetRunner(RunControl *runControl) const
{
// Get uVision executable path.
- const Runnable uv = DebuggerKitAspect::runnable(runControl->kit());
+ const ProcessRunData uv = DebuggerKitAspect::runnable(runControl->kit());
CommandLine server(uv.command.executable());
server.addArg("-j0");
server.addArg(QStringLiteral("-s%1").arg(m_channel.port()));
- Runnable r;
+ ProcessRunData r;
r.command = server;
return new UvscServerProviderRunner(runControl, r);
}
@@ -348,7 +348,7 @@ void UvscServerProviderConfigWidget::setFromProvider()
// UvscServerProviderRunner
UvscServerProviderRunner::UvscServerProviderRunner(ProjectExplorer::RunControl *runControl,
- const Runnable &runnable)
+ const ProcessRunData &runnable)
: RunWorker(runControl)
{
setId("BareMetalUvscServer");
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h
index 3363a51939..82988965ed 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h
+++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h
@@ -121,7 +121,7 @@ class UvscServerProviderRunner final : public ProjectExplorer::RunWorker
{
public:
explicit UvscServerProviderRunner(ProjectExplorer::RunControl *runControl,
- const ProjectExplorer::Runnable &runnable);
+ const Utils::ProcessRunData &runnable);
private:
void start() final;