diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2021-06-25 14:54:27 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2021-09-13 09:26:09 +0000 |
commit | f72c4cb8ac61809742de9106f4c104dbf11ba9e5 (patch) | |
tree | 6857233a078f711de5832d5c2448657d33925245 /src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp | |
parent | 77fed0b0fdce2a93f465c20cd87c41900117dcda (diff) |
Ssh: Re-base SshProcess on top of QtcProcess
Change-Id: I266820e0e2ea12d6e4a5a83a679a7279fab9cd83
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp')
-rw-r--r-- | src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp index 5276f41e4d..56c7a887a7 100644 --- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp @@ -149,7 +149,7 @@ QProcess::ProcessState SshDeviceProcess::state() const QProcess::ExitStatus SshDeviceProcess::exitStatus() const { - return d->exitStatus == QSsh::SshRemoteProcess::NormalExit && d->exitCode != 255 + return d->exitStatus == QProcess::NormalExit && d->exitCode != 255 ? QProcess::NormalExit : QProcess::CrashExit; } @@ -237,7 +237,7 @@ void SshDeviceProcess::handleDisconnected() emit error(QProcess::FailedToStart); break; case SshDeviceProcessPrivate::ProcessRunning: - d->exitStatus = QSsh::SshRemoteProcess::CrashExit; + d->exitStatus = QProcess::CrashExit; emit finished(); default: break; @@ -284,7 +284,7 @@ void SshDeviceProcess::handleKillOperationFinished(const QString &errorMessage) if (errorMessage.isEmpty()) // Process will finish as expected; nothing to do here. return; - d->exitStatus = QSsh::SshRemoteProcess::CrashExit; // Not entirely true, but it will get the message across. + d->exitStatus = QProcess::CrashExit; // Not entirely true, but it will get the message across. d->errorMessage = tr("Failed to kill remote process: %1").arg(errorMessage); d->setState(SshDeviceProcessPrivate::Inactive); emit finished(); @@ -292,7 +292,7 @@ void SshDeviceProcess::handleKillOperationFinished(const QString &errorMessage) void SshDeviceProcess::handleKillOperationTimeout() { - d->exitStatus = QSsh::SshRemoteProcess::CrashExit; // Not entirely true, but it will get the message across. + d->exitStatus = QProcess::CrashExit; // Not entirely true, but it will get the message across. d->errorMessage = tr("Timeout waiting for remote process to finish."); d->setState(SshDeviceProcessPrivate::Inactive); emit finished(); |