From 24660c23e3b71e5e68639cd691b50cce75e62219 Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Tue, 5 Apr 2016 08:11:42 +0200
Subject: [PATCH] RemoteLinux: Fix fetching of remote environment

A QLatin1String isn't a StandardRunnable.
This fixes a regression introduced in 58be2708a.

Change-Id: I6b3bb337227631011a6bc26c938945bb0e912e62
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
---
 .../projectexplorer/devicesupport/sshdeviceprocess.cpp      | 6 +++++-
 src/plugins/remotelinux/remotelinuxenvironmentreader.cpp    | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
index c347dd79e47..686d4ce7126 100644
--- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
+++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
@@ -80,7 +80,11 @@ SshDeviceProcess::~SshDeviceProcess()
 void SshDeviceProcess::start(const Runnable &runnable)
 {
     QTC_ASSERT(d->state == SshDeviceProcessPrivate::Inactive, return);
-    QTC_ASSERT(runnable.is<StandardRunnable>(), return);
+    if (!runnable.is<StandardRunnable>()) {
+        d->errorMessage = tr("Internal error");
+        error(QProcess::FailedToStart);
+        return;
+    }
     d->setState(SshDeviceProcessPrivate::Connecting);
 
     d->errorMessage.clear();
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
index 3d79335b5c6..c0da4463aee 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
@@ -30,6 +30,7 @@
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/target.h>
+#include <projectexplorer/runnables.h>
 
 using namespace ProjectExplorer;
 
@@ -58,7 +59,9 @@ void RemoteLinuxEnvironmentReader::start()
             this, &RemoteLinuxEnvironmentReader::handleError);
     connect(m_deviceProcess, &DeviceProcess::finished,
             this, &RemoteLinuxEnvironmentReader::remoteProcessFinished);
-    m_deviceProcess->start(QLatin1String("env"));
+    StandardRunnable runnable;
+    runnable.executable = QLatin1String("env");
+    m_deviceProcess->start(runnable);
 }
 
 void RemoteLinuxEnvironmentReader::stop()