diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-03-14 15:14:40 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-03-14 15:51:15 +0100 |
| commit | c53ccceff1e1642b7704fa8b0681604c25a833a0 (patch) | |
| tree | 7258d63fba4dabd6f9e2f2f36089ce45df7fe3af /src/libs/ssh/sshremoteprocess.cpp | |
| parent | 62cafc1782369cde0605fbd6b1182a83d5473a12 (diff) | |
| parent | 429eb73ace5909e228a58bf8b067823e2be44212 (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/debugger/debuggerkitinformation.cpp
src/plugins/languageclient/languageclientmanager.cpp
src/plugins/plugins.pro
src/plugins/projectexplorer/kit.cpp
src/plugins/projectexplorer/kitmanager.cpp
Change-Id: I66fb941202991f35f7d7761430b21e42dfc678a8
Diffstat (limited to 'src/libs/ssh/sshremoteprocess.cpp')
| -rw-r--r-- | src/libs/ssh/sshremoteprocess.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/ssh/sshremoteprocess.cpp b/src/libs/ssh/sshremoteprocess.cpp index 48e965d6fa..a769484735 100644 --- a/src/libs/ssh/sshremoteprocess.cpp +++ b/src/libs/ssh/sshremoteprocess.cpp @@ -69,7 +69,7 @@ SshRemoteProcess::SshRemoteProcess(const QByteArray &command, const QStringList connect(this, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [this] { QString error; if (exitStatus() == QProcess::CrashExit) - error = tr("The ssh binary crashed: %1").arg(errorString()); + error = tr("The ssh process crashed: %1").arg(errorString()); else if (exitCode() == 255) error = tr("Remote process crashed."); emit done(error); |