From f6d16ea70c6cb2fd3c122a64b528bdc21579cccb Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Sun, 26 Jul 2020 22:42:14 +0100
Subject: [PATCH 1/2] Remove extraneous include

---
 Network/PSKReporter.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Network/PSKReporter.cpp b/Network/PSKReporter.cpp
index 56f773896..f0f9bd976 100644
--- a/Network/PSKReporter.cpp
+++ b/Network/PSKReporter.cpp
@@ -14,7 +14,6 @@
 #include <QUdpSocket>
 #include <QTcpSocket>
 #include <QHostInfo>
-#include <QUDPSocket>
 #include <QQueue>
 #include <QByteArray>
 #include <QDataStream>

From b0f76b2fe71fcc3abd5a87b83c52b58c66048e6e Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Sun, 26 Jul 2020 22:58:17 +0100
Subject: [PATCH 2/2] Backwards compatibility with Qt <5.11

---
 Network/PSKReporter.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Network/PSKReporter.cpp b/Network/PSKReporter.cpp
index f0f9bd976..06d5d27e5 100644
--- a/Network/PSKReporter.cpp
+++ b/Network/PSKReporter.cpp
@@ -96,7 +96,7 @@ public:
           {
             // handle re-opening asynchronously
             auto connection = QSharedPointer<QMetaObject::Connection>::create ();
-            *connection = connect (socket_.get (), &QAbstractSocket::disconnected, [this, connection] () {
+            *connection = connect (socket_.data (), &QAbstractSocket::disconnected, [this, connection] () {
                                                                                      qDebug () << "PSKReporter::impl::check_connection: disconnected, socket state:" << socket_->state ();
                                                                                      disconnect (*connection);
                                                                                      check_connection ();
@@ -150,7 +150,7 @@ public:
 #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
     connect (socket_.get (), &QAbstractSocket::errorOccurred, this, &PSKReporter::impl::handle_socket_error);
 #else
-    connect (socket_.get (), QOverload<QAbstractSocket::SocketError>::of (&QAbstractSocket::error), this, &PSKReporter::impl::handle_socket_error);
+    connect (socket_.data (), QOverload<QAbstractSocket::SocketError>::of (&QAbstractSocket::error), this, &PSKReporter::impl::handle_socket_error);
 #endif
 
     // use this for pseudo connection with UDP, allows us to use