From ac1ce65a386aae6db2949b8684c9ea65fb946c78 Mon Sep 17 00:00:00 2001 From: Filipe Azevedo Date: Wed, 15 Nov 2017 13:22:45 +0100 Subject: [PATCH] Add isRemoteRunning() as isRunning() only apply to local processes Change-Id: I75d726cea160c557374051db3ba413d3dd1a41a2 Reviewed-by: Ulf Hermann --- src/plugins/projectexplorer/applicationlauncher.cpp | 11 +++++++++++ src/plugins/projectexplorer/applicationlauncher.h | 1 + 2 files changed, 12 insertions(+) diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp index da295063257..f0d84760c54 100644 --- a/src/plugins/projectexplorer/applicationlauncher.cpp +++ b/src/plugins/projectexplorer/applicationlauncher.cpp @@ -87,6 +87,7 @@ public: void bringToForeground(); qint64 applicationPID() const; bool isRunning() const; + bool isRemoteRunning() const; // Remote void doReportError(const QString &message); @@ -220,6 +221,11 @@ bool ApplicationLauncher::isRunning() const return d->isRunning(); } +bool ApplicationLauncher::isRemoteRunning() const +{ + return d->isRemoteRunning(); +} + bool ApplicationLauncherPrivate::isRunning() const { if (m_currentMode == ApplicationLauncher::Gui) @@ -227,6 +233,11 @@ bool ApplicationLauncherPrivate::isRunning() const return m_consoleProcess.isRunning(); } +bool ApplicationLauncherPrivate::isRemoteRunning() const +{ + return m_isLocal ? false : m_deviceProcess->state() == QProcess::Running; +} + ProcessHandle ApplicationLauncher::applicationPID() const { return ProcessHandle(d->applicationPID()); diff --git a/src/plugins/projectexplorer/applicationlauncher.h b/src/plugins/projectexplorer/applicationlauncher.h index a8570dbbaab..3c6178f815f 100644 --- a/src/plugins/projectexplorer/applicationlauncher.h +++ b/src/plugins/projectexplorer/applicationlauncher.h @@ -61,6 +61,7 @@ public: void stop(); bool isRunning() const; Utils::ProcessHandle applicationPID() const; + bool isRemoteRunning() const; QString errorString() const; QProcess::ProcessError processError() const;