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

SshDeviceProcess: Don't store exitCode

Browse Source 
Change-Id: Id957dc7b0e71d0d1376716cb2b63c83d43cc1a14
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-01-28 14:08:35 +01:00
parent d48a4bd60f
commit f7c9dac3a7
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
View File

@@ -58,7 +58,6 @@ public:
QProcess::ExitStatus exitStatus = QProcess::NormalExit; QProcess::ExitStatus exitStatus = QProcess::NormalExit;
DeviceProcessSignalOperation::Ptr killOperation; DeviceProcessSignalOperation::Ptr killOperation;
QTimer killTimer; QTimer killTimer;
int exitCode = -1;
enum State { Inactive, Connecting, Connected, ProcessRunning } state = Inactive; enum State { Inactive, Connecting, Connected, ProcessRunning } state = Inactive;
void setState(State newState); void setState(State newState);
@@ -89,7 +88,6 @@ void SshDeviceProcess::start(const Runnable &runnable)
d->setState(SshDeviceProcessPrivate::Connecting); d->setState(SshDeviceProcessPrivate::Connecting);
d->errorMessage.clear(); d->errorMessage.clear();
d->exitCode = -1;
d->exitStatus = QProcess::NormalExit; d->exitStatus = QProcess::NormalExit;
d->runnable = runnable; d->runnable = runnable;
QSsh::SshConnectionParameters params = device()->sshParameters(); QSsh::SshConnectionParameters params = device()->sshParameters();
@@ -145,13 +143,13 @@ QProcess::ProcessState SshDeviceProcess::state() const
QProcess::ExitStatus SshDeviceProcess::exitStatus() const QProcess::ExitStatus SshDeviceProcess::exitStatus() const
{ {
return d->exitStatus == QProcess::NormalExit && d->exitCode != 255 return d->exitStatus == QProcess::NormalExit && exitCode() != 255
? QProcess::NormalExit : QProcess::CrashExit; ? QProcess::NormalExit : QProcess::CrashExit;
} }
int SshDeviceProcess::exitCode() const int SshDeviceProcess::exitCode() const
{ {
return d->exitCode; return runInTerminal() ? QtcProcess::exitCode() : d->remoteProcess->exitCode();
} }
QString SshDeviceProcess::errorString() const QString SshDeviceProcess::errorString() const
@@ -241,7 +239,6 @@ void SshDeviceProcess::handleProcessStarted()
void SshDeviceProcess::handleProcessFinished(const QString &error) void SshDeviceProcess::handleProcessFinished(const QString &error)
{ {
d->errorMessage = error; d->errorMessage = error;
d->exitCode = runInTerminal() ? QtcProcess::exitCode() : d->remoteProcess->exitCode();
if (d->killOperation && error.isEmpty()) if (d->killOperation && error.isEmpty())
d->errorMessage = tr("The process was ended forcefully."); d->errorMessage = tr("The process was ended forcefully.");
d->setState(SshDeviceProcessPrivate::Inactive); d->setState(SshDeviceProcessPrivate::Inactive);