aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFilipe Azevedo <filipe.azevedo@kdab.com>2017-11-15 13:22:45 +0100
committerFilipe Azevedo <filipe.azevedo@kdab.com>2017-11-16 10:10:31 +0000
commitac1ce65a386aae6db2949b8684c9ea65fb946c78 (patch)
tree27742ed1ff10d32640c9a330e8db4c2845e602b8 /src
parent17b761ce86e9fdfadff49b35858533d06ba0d05b (diff)
Add isRemoteRunning() as isRunning() only apply to local processes
Change-Id: I75d726cea160c557374051db3ba413d3dd1a41a2 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/projectexplorer/applicationlauncher.cpp11
-rw-r--r--src/plugins/projectexplorer/applicationlauncher.h1
2 files changed, 12 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp
index da29506325..f0d84760c5 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 a8570dbbaa..3c6178f815 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;