Revert "Remote Linux: Rework device testing"

This reverts commit 934c067ddf365c6f12b1e4a1e431f27610b32f7d,
because it breaks running remote Linux applications due to 
buggy refactoring of the remote ports gatherer.

Change-Id: I15fd8d4f3e76452a8c5c735316991bd00900444f
Reviewed-by: Christian Kandeler <[email protected]>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/plugins/remotelinux/remotelinuxapplicationrunner.cpp b/src/plugins/remotelinux/remotelinuxapplicationrunner.cpp
index d9a77c4e812..c38b29444d1 100644
--- a/src/plugins/remotelinux/remotelinuxapplicationrunner.cpp
+++ b/src/plugins/remotelinux/remotelinuxapplicationrunner.cpp
@@ -62,8 +62,7 @@ class AbstractRemoteLinuxApplicationRunnerPrivate
 {
 public:
     AbstractRemoteLinuxApplicationRunnerPrivate(const RemoteLinuxRunConfiguration *runConfig)
-        : portsGatherer(runConfig->deviceConfig()),
-          devConfig(runConfig->deviceConfig()),
+        : devConfig(runConfig->deviceConfig()),
           remoteExecutable(runConfig->remoteExecutableFilePath()),
           appArguments(runConfig->arguments()),
           commandPrefix(runConfig->commandPrefix()),
@@ -168,7 +167,7 @@ void AbstractRemoteLinuxApplicationRunner::stop()
         emit remoteProcessFinished(InvalidExitCode);
         break;
     case GatheringPorts:
-        d->portsGatherer.cancel();
+        d->portsGatherer.stop();
         setInactive();
         emit remoteProcessFinished(InvalidExitCode);
         break;
@@ -308,7 +307,7 @@ void AbstractRemoteLinuxApplicationRunner::handleRemoteProcessFinished(int exitS
 
 void AbstractRemoteLinuxApplicationRunner::setInactive()
 {
-    d->portsGatherer.cancel();
+    d->portsGatherer.stop();
     if (d->connection) {
         disconnect(d->connection.data(), 0, this, 0);
         SshConnectionManager::instance().releaseConnection(d->connection);
@@ -423,7 +422,7 @@ void AbstractRemoteLinuxApplicationRunner::handleInitialCleanupDone(bool success
     }
 
     d->state = GatheringPorts;
-    d->portsGatherer.run();
+    d->portsGatherer.start(d->connection, d->devConfig);
 }
 
 void AbstractRemoteLinuxApplicationRunner::handleInitializationsDone(bool success)