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

Ssh: Re-base SshProcess on top of QtcProcess

Browse Source 
Change-Id: I266820e0e2ea12d6e4a5a83a679a7279fab9cd83
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2021-06-25 14:54:27 +02:00
parent 77fed0b0fd
commit f72c4cb8ac
18 changed files with 116 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();