From 3a028c097ab14fcb182ed9c30fdd58cec56bcf3d Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Wed, 24 Feb 2010 16:15:44 +0100
Subject: [PATCH] Maemo: Catch Botan exceptions.
Task-number: TOOLS-297
---
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
index c3ce401ef42..b43af146e29 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
@@ -41,6 +41,8 @@
#include "maemosshthread.h"
+#include <exception>
+
namespace Qt4ProjectManager {
namespace Internal {
@@ -62,6 +64,10 @@ void MaemoSshThread::run()
runInternal();
} catch (const MaemoSshException &e) {
m_error = e.error();
+ } catch (const std::exception &e) {
+ // Should in theory not be necessary, but Net7 leaks Botan exceptions.
+ m_error = tr("Error in cryptography backend: ")
+ + QLatin1String(e.what());
}
}
--
GitLab