diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-04 12:23:39 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-04 12:23:39 +0200 |
| commit | db4311d5b5786277c78c8840b8e16b334500856b (patch) | |
| tree | fdd10b093d403acc72018efba4051506a832fc6c /src/libs/ssh/sshconnection.cpp | |
| parent | d2bf853ca13854cee1757583cd8789741e3b8e18 (diff) | |
| parent | ed86a7ca5860b7e48fd7de2a63f3983f37667c4b (diff) | |
| download | qt-creator-db4311d5b5786277c78c8840b8e16b334500856b.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
dist/gdb/Makefile.osx
src/libs/qmldebug/qmldebug.qbs
src/plugins/android/androidsettingswidget.cpp
Change-Id: I85627130b575f7d08f416dea52031fa72019b217
Diffstat (limited to 'src/libs/ssh/sshconnection.cpp')
| -rw-r--r-- | src/libs/ssh/sshconnection.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/ssh/sshconnection.cpp b/src/libs/ssh/sshconnection.cpp index e03304ca2e..0498b4f285 100644 --- a/src/libs/ssh/sshconnection.cpp +++ b/src/libs/ssh/sshconnection.cpp @@ -365,8 +365,8 @@ void SshConnectionPrivate::handleServerId() if (newLinePos > 255 - 1) { throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR, "Identification string too long.", - tr("Server identification string is %1 characters long, but the maximum " - "allowed length is 255.").arg(newLinePos + 1)); + tr("Server identification string is %n characters long, but the maximum " + "allowed length is 255.", 0, newLinePos + 1)); } const bool hasCarriageReturn = m_incomingData.at(newLinePos - 1) == '\r'; |