From 6c00b2e8a42f4a47feb29b2d84a9fb07d7798aa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
Date: Mon, 12 Apr 2021 16:38:19 +0200
Subject: QNetworkInformation: Private the destructor

It wasn't meant to be public.

Change-Id: Ifa7fff48f82b96bdfa277677d3988dc8881b8c2a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit b1fe3e3d80cb23dee4de683e03711d1ac0614de2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/network/kernel/qnetworkinformation.cpp | 7 ++++++-
 src/network/kernel/qnetworkinformation.h   | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/network/kernel/qnetworkinformation.cpp b/src/network/kernel/qnetworkinformation.cpp
index 1ebe2f6045..6ce572d408 100644
--- a/src/network/kernel/qnetworkinformation.cpp
+++ b/src/network/kernel/qnetworkinformation.cpp
@@ -56,6 +56,11 @@ QT_BEGIN_NAMESPACE
 Q_DECLARE_LOGGING_CATEGORY(lcNetInfo)
 Q_LOGGING_CATEGORY(lcNetInfo, "qt.network.info");
 
+struct QNetworkInformationDeleter
+{
+    void operator()(QNetworkInformation *information) { delete information; }
+};
+
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
                           (QNetworkInformationBackendFactory_iid,
                            QStringLiteral("/networkinformationbackends")))
@@ -63,7 +68,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
 struct QStaticNetworkInformationDataHolder
 {
     QMutex instanceMutex;
-    std::unique_ptr<QNetworkInformation> instanceHolder;
+    std::unique_ptr<QNetworkInformation, QNetworkInformationDeleter> instanceHolder;
     QList<QNetworkInformationBackendFactory *> factories;
 };
 Q_GLOBAL_STATIC(QStaticNetworkInformationDataHolder, dataHolder);
diff --git a/src/network/kernel/qnetworkinformation.h b/src/network/kernel/qnetworkinformation.h
index 84d29c8a41..07f4fe873d 100644
--- a/src/network/kernel/qnetworkinformation.h
+++ b/src/network/kernel/qnetworkinformation.h
@@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE
 
 class QNetworkInformationBackend;
 class QNetworkInformationPrivate;
+struct QNetworkInformationDeleter;
 class Q_NETWORK_EXPORT QNetworkInformation : public QObject
 {
     Q_OBJECT
@@ -70,8 +71,6 @@ public:
     Q_DECLARE_FLAGS(Features, Feature)
     Q_FLAG(Features)
 
-    ~QNetworkInformation() override;
-
     Reachability reachability() const;
 
     QString backendName() const;
@@ -87,8 +86,10 @@ Q_SIGNALS:
     void reachabilityChanged(Reachability newReachability);
 
 private:
+    friend struct QNetworkInformationDeleter;
     friend class QNetworkInformationPrivate;
     QNetworkInformation(QNetworkInformationBackend *backend);
+    ~QNetworkInformation() override;
 
     Q_DISABLE_COPY_MOVE(QNetworkInformation)
 };
-- 
cgit v1.2.3