diff options
| author | hjk <hjk@qt.io> | 2017-03-09 14:13:13 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2017-03-10 15:14:12 +0000 |
| commit | 7826ec7ed5c44cf6bc5c80f10c8588dff8372c5d (patch) | |
| tree | 926a70a8e3228e480b6b5494cd3526c05d263b1e /src/plugins/remotelinux/remotelinuxdebugsupport.cpp | |
| parent | 5090c2929a7ccf20ebe379bb572fd5bcbb10f8e1 (diff) | |
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>
Diffstat (limited to 'src/plugins/remotelinux/remotelinuxdebugsupport.cpp')
| -rw-r--r-- | src/plugins/remotelinux/remotelinuxdebugsupport.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp index d94dd27ec7..d4cf2e95f2 100644 --- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp +++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp @@ -33,7 +33,6 @@ #include <debugger/debuggerkitinformation.h> #include <projectexplorer/buildconfiguration.h> -#include <projectexplorer/devicesupport/deviceapplicationrunner.h> #include <projectexplorer/project.h> #include <projectexplorer/runnables.h> #include <projectexplorer/target.h> @@ -128,19 +127,19 @@ void LinuxDeviceDebugSupport::startExecution() setState(StartingRunner); d->gdbserverOutput.clear(); - DeviceApplicationRunner *runner = appRunner(); - connect(runner, &DeviceApplicationRunner::remoteStderr, + ApplicationLauncher *launcher = appRunner(); + connect(launcher, &ApplicationLauncher::remoteStderr, this, &LinuxDeviceDebugSupport::handleRemoteErrorOutput); - connect(runner, &DeviceApplicationRunner::remoteStdout, + connect(launcher, &ApplicationLauncher::remoteStdout, this, &LinuxDeviceDebugSupport::handleRemoteOutput); - connect(runner, &DeviceApplicationRunner::finished, + connect(launcher, &ApplicationLauncher::finished, this, &LinuxDeviceDebugSupport::handleAppRunnerFinished); - connect(runner, &DeviceApplicationRunner::reportProgress, + connect(launcher, &ApplicationLauncher::reportProgress, this, &LinuxDeviceDebugSupport::handleProgressReport); - connect(runner, &DeviceApplicationRunner::reportError, + connect(launcher, &ApplicationLauncher::reportError, this, &LinuxDeviceDebugSupport::handleAppRunnerError); if (d->qmlDebugging && !d->cppDebugging) - connect(runner, &DeviceApplicationRunner::remoteProcessStarted, + connect(launcher, &ApplicationLauncher::remoteProcessStarted, this, &LinuxDeviceDebugSupport::handleRemoteProcessStarted); StandardRunnable r = runnable(); @@ -162,7 +161,7 @@ void LinuxDeviceDebugSupport::startExecution() } r.executable = command; r.commandLineArguments = QtcProcess::joinArgs(args, OsTypeLinux); - runner->start(r, device()); + launcher->start(r, device()); } void LinuxDeviceDebugSupport::handleAppRunnerError(const QString &error) |