From 350b8372724f935c4ade3f95410d93f02180c752 Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Tue, 31 May 2022 12:45:22 +0300
Subject: [PATCH] Fix LDAP search with Qt6 and minor fixes (#1075)

IB-7410

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 client/Application.cpp           |  3 +++
 client/Diagnostics_unix.cpp      | 10 +++++++---
 client/Diagnostics_win.cpp       |  6 +++++-
 client/dialogs/AddRecipients.cpp |  2 +-
 qdigidoc4.wxs                    |  1 -
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/client/Application.cpp b/client/Application.cpp
index 8c39822d3..943aeb90b 100644
--- a/client/Application.cpp
+++ b/client/Application.cpp
@@ -482,6 +482,9 @@ Application::~Application()
 	digidoc::terminate();
 	delete d;
 
+	QDesktopServices::unsetUrlHandler(QStringLiteral("browse"));
+	QDesktopServices::unsetUrlHandler(QStringLiteral("mailto"));
+
 	if(property("restart").toBool())
 	{
 		QStringList args = arguments();
diff --git a/client/Diagnostics_unix.cpp b/client/Diagnostics_unix.cpp
index 9aae3157c..da6f81616 100644
--- a/client/Diagnostics_unix.cpp
+++ b/client/Diagnostics_unix.cpp
@@ -24,6 +24,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
 #include <QtCore/QProcess>
+#include <QtNetwork/QSslSocket>
 
 #include <sys/utsname.h>
 #ifdef Q_OS_MAC
@@ -116,15 +117,18 @@ void Diagnostics::run()
 	emit update( info );
 	info.clear();
 
-	s << "<b>" << tr("Libraries") << ":</b><br />" << packages({
+	s << "<b>" << tr("Libraries") << ":</b><br />"
+		<< "QT (" << qVersion() << ")" << "<br />"
+		<< "OpenSSL build (" << QSslSocket::sslLibraryBuildVersionString() << ")<br />"
+		<< "OpenSSL current (" << QSslSocket::sslLibraryVersionString() << ")<br />"
+		<< packages({
 #ifdef Q_OS_MAC
 		"digidocpp"
 #else
 		"libdigidoc2", "libdigidocpp1", "qdigidoc", "qesteidutil", "qdigidoc-tera", "firefox-pkcs11-loader",
 		"chrome-token-signing", "web-eid", "openssl", "libpcsclite1", "pcsc-lite", "opensc", "awp"
 #endif
-	}).join(QStringLiteral("<br />")) << "<br />";
-	s << "QT (" << qVersion() << ")" << "<br /><br />";
+		}).join(QStringLiteral("<br />")) << "<br /><br />";
 	emit update( info );
 	info.clear();
 
diff --git a/client/Diagnostics_win.cpp b/client/Diagnostics_win.cpp
index 7651f899e..1f7c9b8b1 100644
--- a/client/Diagnostics_win.cpp
+++ b/client/Diagnostics_win.cpp
@@ -26,6 +26,7 @@
 #include <QtCore/QSettings>
 #include <QtCore/QTextStream>
 #include <QtCore/QVector>
+#include <QtNetwork/QSslSocket>
 
 #include <qt_windows.h>
 
@@ -133,7 +134,10 @@ void Diagnostics::run()
 	emit update( info );
 	info.clear();
 
-	s << "<b>" << tr("Libraries") << ":</b><br />" << "QT (" << qVersion() << ")<br />";
+	s << "<b>" << tr("Libraries") << ":</b><br />"
+		<< "QT (" << qVersion() << ")<br />"
+		<< "OpenSSL build (" << QSslSocket::sslLibraryBuildVersionString() << ")<br />"
+		<< "OpenSSL current (" << QSslSocket::sslLibraryVersionString() << ")<br />";
 
 	QByteArray path = qgetenv("PATH");
 	qputenv("PATH", path
diff --git a/client/dialogs/AddRecipients.cpp b/client/dialogs/AddRecipients.cpp
index d1b836c8a..107e22e50 100644
--- a/client/dialogs/AddRecipients.cpp
+++ b/client/dialogs/AddRecipients.cpp
@@ -401,7 +401,7 @@ void AddRecipients::search(const QString &term, bool select, const QString &type
 	};
 	QString cleanTerm = term.simplified();
 	bool isDigit = false;
-	cleanTerm.toULong(&isDigit);
+	cleanTerm.toULongLong(&isDigit);
 	if(isDigit && (cleanTerm.size() == 11 || cleanTerm.size() == 8))
 	{
 		if(cleanTerm.size() == 11)
diff --git a/qdigidoc4.wxs b/qdigidoc4.wxs
index 4f9c2696d..fa86fbb91 100644
--- a/qdigidoc4.wxs
+++ b/qdigidoc4.wxs
@@ -195,7 +195,6 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
           </Directory>
           <Directory Id="imageformats" Name="imageformats" FileSource="$(var.qt_path)\..\plugins\imageformats">
             <Component Id="imageformats.dll" Guid="2796915c-6255-4569-97cc-12fa979c4777">
-              <File Name="qgif$(var.qt_suffix).dll"/>
               <File Name="qjpeg$(var.qt_suffix).dll"/>
               <File Name="qsvg$(var.qt_suffix).dll"/>
             </Component>