summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2021-06-21 12:08:10 +0200
committerhjk <hjk@qt.io>2021-06-21 12:14:14 +0000
commitf558323bacbb0de16d0fec4ee2d1ea717d518b79 (patch)
tree67d898390923c1f3eced5877b220df211ed27d77
parent085e5ebe321d106932429f2b2f45ee995050e04e (diff)
downloadqt-creator-f558323bacbb0de16d0fec4ee2d1ea717d518b79.tar.gz
Docker: Actually run 'env' on the docker device to get the environment
Change-Id: Ice31b4f7cfd6c699a78da1518405d8d6bb6e3611 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--src/plugins/docker/dockerdevice.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index 03743b3644..8074b88132 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -958,7 +958,8 @@ void DockerDevicePrivate::fetchSystemEnviroment()
SynchronousProcess proc;
proc.setCommand({"env", {}});
- proc.runBlocking();
+ q->runProcess(proc); // FIXME: This only starts.
+ proc.waitForFinished();
const QString remoteOutput = proc.stdOut();
m_cachedEnviroment = Environment(remoteOutput.split('\n', Qt::SkipEmptyParts), q->osType());