feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Add isRemoteRunning() as isRunning() only apply to local processes

Browse Source 
Change-Id: I75d726cea160c557374051db3ba413d3dd1a41a2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Filipe Azevedo
2017-11-15 13:22:45 +01:00
parent 17b761ce86
commit ac1ce65a38
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/projectexplorer/applicationlauncher.cpp
View File

@@ -87,6 +87,7 @@ public:
void bringToForeground(); void bringToForeground();
qint64 applicationPID() const; qint64 applicationPID() const;
bool isRunning() const; bool isRunning() const;
bool isRemoteRunning() const;
// Remote // Remote
void doReportError(const QString &message); void doReportError(const QString &message);
@@ -220,6 +221,11 @@ bool ApplicationLauncher::isRunning() const
return d->isRunning(); return d->isRunning();
} }
bool ApplicationLauncher::isRemoteRunning() const
{
return d->isRemoteRunning();
}
bool ApplicationLauncherPrivate::isRunning() const bool ApplicationLauncherPrivate::isRunning() const
{ {
if (m_currentMode == ApplicationLauncher::Gui) if (m_currentMode == ApplicationLauncher::Gui)
@@ -227,6 +233,11 @@ bool ApplicationLauncherPrivate::isRunning() const
return m_consoleProcess.isRunning(); return m_consoleProcess.isRunning();
} }
bool ApplicationLauncherPrivate::isRemoteRunning() const
{
return m_isLocal ? false : m_deviceProcess->state() == QProcess::Running;
}
ProcessHandle ApplicationLauncher::applicationPID() const ProcessHandle ApplicationLauncher::applicationPID() const
{ {
return ProcessHandle(d->applicationPID()); return ProcessHandle(d->applicationPID());

1
src/plugins/projectexplorer/applicationlauncher.h
View File

@@ -61,6 +61,7 @@ public:
void stop(); void stop();
bool isRunning() const; bool isRunning() const;
Utils::ProcessHandle applicationPID() const; Utils::ProcessHandle applicationPID() const;
bool isRemoteRunning() const;
QString errorString() const; QString errorString() const;
QProcess::ProcessError processError() const; QProcess::ProcessError processError() const;