ProjectExplorer: Merge ApplicationLauncher and DeviceApplicationRunner

Treat ApplicationLauncher as a special case of a DeviceApplicationRunner
with an implicit desktop device.

As a first step, lump the two implementations together.

Change-Id: Ifa3ea3f38d320023050378555e2d256e762b6683
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

1 files changed, 10 insertions, 0 deletions

diff --git a/src/plugins/projectexplorer/applicationlauncher.h b/src/plugins/projectexplorer/applicationlauncher.h
index ccf967ba92..354281772f 100644
--- a/src/plugins/projectexplorer/applicationlauncher.h
+++ b/src/plugins/projectexplorer/applicationlauncher.h
@@ -27,6 +27,8 @@
 
 #include "projectexplorer_export.h"
 
+#include "devicesupport/idevice.h"
+
 #include <utils/outputformat.h>
 
 #include <QProcess>
@@ -54,6 +56,7 @@ public:
 
     void setProcessChannelMode(QProcess::ProcessChannelMode mode);
     void start(const Runnable &runnable);
+    void start(const Runnable &runnable, const IDevice::ConstPtr &device);
     void stop();
     bool isRunning() const;
     qint64 applicationPID() const;
@@ -70,6 +73,13 @@ signals:
     void processExited(int exitCode, QProcess::ExitStatus);
     void error(QProcess::ProcessError error);
 
+    void remoteStdout(const QByteArray &output);
+    void remoteStderr(const QByteArray &output);
+    void reportProgress(const QString &progressOutput);
+    void reportError(const QString &errorOutput);
+    void remoteProcessStarted();
+    void finished(bool success);
+
 private:
     Internal::ApplicationLauncherPrivate *d;
 };