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

Merge remote-tracking branch 'origin/4.3'

Browse Source 
Conflicts:
	src/plugins/debugger/cdb/cdbengine.cpp

Change-Id: Ib9aeccc4162c43e9ee3d85847d96678045625dd0
This commit is contained in:
Eike Ziller
2017-05-09 15:07:30 +02:00
parent d571e8d442 3282f85f3d
commit 6e8ee7479e
69 changed files with 475 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/ssh/sshconnection.cpp
View File

@@ -200,7 +200,7 @@ int SshConnection::closeAllChannels()
{
try {
return d->m_channelManager->closeAllChannels(Internal::SshChannelManager::CloseAllRegular);
} catch (const Botan::Exception &e) {
} catch (const std::exception &e) {
qCWarning(Internal::sshLog, "%s: %s", Q_FUNC_INFO, e.what());
return -1;
}
@@ -346,7 +346,7 @@ void SshConnectionPrivate::handleIncomingData()
} catch (const SshClientException &e) {
closeConnection(SSH_DISCONNECT_BY_APPLICATION, e.error, "",
e.errorString);
} catch (const Botan::Exception &e) {
} catch (const std::exception &e) {
closeConnection(SSH_DISCONNECT_BY_APPLICATION, SshInternalError, "",
tr("Botan library exception: %1").arg(QString::fromLatin1(e.what())));
}