LinuxDeviceProcess: Quote environment variable values.

The current code breaks for values that contain spaces.

Change-Id: Ia2a318dcac09a8d1c1ce368378a33c633f28bf49
Reviewed-by: hjk <hjk121@nokiamail.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/src/plugins/remotelinux/linuxdeviceprocess.cpp b/src/plugins/remotelinux/linuxdeviceprocess.cpp
index cf60d6a2e0..f0c8cec85e 100644
--- a/src/plugins/remotelinux/linuxdeviceprocess.cpp
+++ b/src/plugins/remotelinux/linuxdeviceprocess.cpp
@@ -61,7 +61,13 @@ QString LinuxDeviceProcess::fullCommandLine() const
         fullCommandLine.append(QLatin1String("cd ")).append(quote(m_workingDir))
                 .append(QLatin1String(" && "));
     }
-    const QString envString = environment().toStringList().join(QLatin1String(" "));
+    QString envString;
+    for (auto it = environment().constBegin(); it != environment().constEnd(); ++it) {
+        if (!envString.isEmpty())
+            envString += QLatin1Char(' ');
+        envString.append(it.key()).append(QLatin1String("='")).append(it.value())
+                .append(QLatin1Char('\''));
+    }
     if (!envString.isEmpty())
         fullCommandLine.append(QLatin1Char(' ')).append(envString);
     if (!fullCommandLine.isEmpty())