From eb2bafc3d2b36f7bbb7012bee3a21bacb8cf50e2 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 31 Oct 2022 15:53:01 +0100
Subject: Add a few hacks to make it compile on Qt 5.12 again

---
 src/server/net/certmanager.cpp | 2 ++
 src/server/net/client.cpp      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/server')

diff --git a/src/server/net/certmanager.cpp b/src/server/net/certmanager.cpp
index 968535a..5a4f904 100644
--- a/src/server/net/certmanager.cpp
+++ b/src/server/net/certmanager.cpp
@@ -19,6 +19,8 @@
 
 #include "certmanager.h"
 #include "../../shared/util.h"
+// Remove in future - see comment in util.h
+#undef errorOccurred
 
 #include <QHash>
 #include <QDir>
diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp
index 08dfc9a..bf1ad25 100644
--- a/src/server/net/client.cpp
+++ b/src/server/net/client.cpp
@@ -31,7 +31,7 @@ Client::Client(QTcpSocket* socket)
 	// Connect important signals
 	connect(_socket, &QTcpSocket::disconnected,
 	        this, &Client::disconnect);
-	connect(_socket, &QTcpSocket::errorOccurred,
+	connect(_socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::errorOccurred),
 	        this, &Client::disconnect);
 	auto *ssl = qobject_cast<QSslSocket*>(_socket);
 	if (ssl != nullptr) {
-- 
cgit v1.2.3-55-g7522