aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <[email protected]>2012-06-08 08:23:32 +0200
committerhjk <[email protected]>2012-06-08 10:12:11 +0200
commit303e67304e42cc419b735ca609104ad4ed386d54 (patch)
tree2641f93d25319c5712ad1abeece321667277065e /src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
parent69a437873a88d058b89770b5cfae35aa8b75bc2c (diff)
SSH: Name SshRemoteProcess::ExitStatus values like the QProcess ones.
(We cannot use QProcess::ExitStatus itself, because it does not contain FailedToStart.) Change-Id: I83ed6de621e2693e539562cd8e56ef478fa4fcb9 Reviewed-by: hjk <[email protected]>
Diffstat (limited to 'src/plugins/remotelinux/remotelinuxenvironmentreader.cpp')
-rw-r--r--src/plugins/remotelinux/remotelinuxenvironmentreader.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
index 5fd0213aed4..43aa56542f6 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
@@ -103,15 +103,15 @@ void RemoteLinuxEnvironmentReader::handleCurrentDeviceConfigChanged()
void RemoteLinuxEnvironmentReader::remoteProcessFinished(int exitCode)
{
Q_ASSERT(exitCode == QSsh::SshRemoteProcess::FailedToStart
- || exitCode == QSsh::SshRemoteProcess::KilledBySignal
- || exitCode == QSsh::SshRemoteProcess::ExitedNormally);
+ || exitCode == QSsh::SshRemoteProcess::CrashExit
+ || exitCode == QSsh::SshRemoteProcess::NormalExit);
if (m_stop)
return;
disconnect(m_remoteProcessRunner, 0, this, 0);
m_env.clear();
- if (exitCode == QSsh::SshRemoteProcess::ExitedNormally) {
+ if (exitCode == QSsh::SshRemoteProcess::NormalExit) {
if (!m_remoteOutput.isEmpty()) {
m_env = Utils::Environment(m_remoteOutput.split(QLatin1Char('\n'),
QString::SkipEmptyParts));