aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/docker/dockerdevice.cpp
diff options
context:
space:
mode:
authorhjk <[email protected]>2021-08-10 09:19:30 +0200
committerhjk <[email protected]>2021-08-13 15:04:30 +0000
commit52e5023bcce391f7bd47b70e62c3f4ab04d319f7 (patch)
tree6288d6e7e901b6f2c8e3ef29e1cd1fe1f85be4f2 /src/plugins/docker/dockerdevice.cpp
parent33108795d6b2dd1e91942efb3c1c27ad23342295 (diff)
ProjectExplorer: Use Utils::CommandLine in ProjectExplorer::Runnable
Change-Id: Id965f1f9047dcbc3ea5c9ddaa550d12668cf8ae6 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Christian Stenger <[email protected]>
Diffstat (limited to 'src/plugins/docker/dockerdevice.cpp')
-rw-r--r--src/plugins/docker/dockerdevice.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index 2bfee35354e..83bb5bbe0ad 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -144,7 +144,7 @@ void DockerDeviceProcess::start(const Runnable &runnable)
disconnect(&m_process);
- m_process.setCommand(runnable.commandLine());
+ m_process.setCommand(runnable.command);
m_process.setEnvironment(runnable.environment);
m_process.setWorkingDirectory(runnable.workingDirectory);
connect(&m_process, &QtcProcess::errorOccurred, this, &DeviceProcess::error);
@@ -214,9 +214,8 @@ class DockerPortsGatheringMethod : public PortsGatheringMethod
// /proc/net/tcp* covers /proc/net/tcp and /proc/net/tcp6
Runnable runnable;
- runnable.executable = FilePath::fromString("sed");
- runnable.commandLineArguments
- = "-e 's/.*: [[:xdigit:]]*:\\([[:xdigit:]]\\{4\\}\\).*/\\1/g' /proc/net/tcp*";
+ runnable.command.setExecutable(FilePath::fromString("sed"));
+ runnable.command.setArguments("-e 's/.*: [[:xdigit:]]*:\\([[:xdigit:]]\\{4\\}\\).*/\\1/g' /proc/net/tcp*");
return runnable;
}
@@ -485,7 +484,7 @@ DockerDevice::DockerDevice(const DockerDeviceData &data)
});
Runnable runnable;
- runnable.executable = FilePath::fromString("/bin/sh");
+ runnable.command = {"/bin/sh", {}};
runnable.device = sharedFromThis();
runnable.environment = env;
runnable.workingDirectory = workingDir;