1 files changed, 40 insertions, 43 deletions

diff --git a/src/network/kernel/qnetworkinformation.h b/src/network/kernel/qnetworkinformation.h
index bc71b37c64..4e70a7faf2 100644
--- a/src/network/kernel/qnetworkinformation.h
+++ b/src/network/kernel/qnetworkinformation.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtNetwork module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QNETWORKINFORMATION_H
 #define QNETWORKINFORMATION_H
@@ -49,11 +13,17 @@ QT_BEGIN_NAMESPACE
 
 class QNetworkInformationBackend;
 class QNetworkInformationPrivate;
+struct QNetworkInformationDeleter;
 class Q_NETWORK_EXPORT QNetworkInformation : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QNetworkInformation)
     Q_PROPERTY(Reachability reachability READ reachability NOTIFY reachabilityChanged)
+    Q_PROPERTY(bool isBehindCaptivePortal READ isBehindCaptivePortal
+               NOTIFY isBehindCaptivePortalChanged)
+    Q_PROPERTY(TransportMedium transportMedium READ transportMedium NOTIFY transportMediumChanged)
+    Q_PROPERTY(bool isMetered READ isMetered NOTIFY isMeteredChanged)
+    Q_CLASSINFO("RegisterEnumClassesUnscoped", "false")
 public:
     enum class Reachability {
         Unknown,
@@ -64,31 +34,58 @@ public:
     };
     Q_ENUM(Reachability)
 
+    enum class TransportMedium {
+        Unknown,
+        Ethernet,
+        Cellular,
+        WiFi,
+        Bluetooth,
+    };
+    Q_ENUM(TransportMedium)
+
     enum class Feature {
         Reachability = 0x1,
+        CaptivePortal = 0x2,
+        TransportMedium = 0x4,
+        Metered = 0x8,
     };
     Q_DECLARE_FLAGS(Features, Feature)
     Q_FLAG(Features)
 
-    ~QNetworkInformation() override;
-
     Reachability reachability() const;
 
+    bool isBehindCaptivePortal() const;
+
+    TransportMedium transportMedium() const;
+
+    bool isMetered() const;
+
     QString backendName() const;
 
-    virtual bool supports(Features features) const;
+    bool supports(Features features) const;
+    Features supportedFeatures() const;
 
-    static bool load(QStringView backend = {});
-    static bool load(Features features);
+    static bool loadDefaultBackend();
+    static bool loadBackendByName(QStringView backend);
+    static bool loadBackendByFeatures(Features features);
+#if QT_DEPRECATED_SINCE(6,4)
+    QT_DEPRECATED_VERSION_X_6_4("Use loadBackendByName") static bool load(QStringView backend);
+    QT_DEPRECATED_VERSION_X_6_4("Use loadBackendByFeatures") static bool load(Features features);
+#endif
     static QStringList availableBackends();
     static QNetworkInformation *instance();
 
 Q_SIGNALS:
     void reachabilityChanged(Reachability newReachability);
+    void isBehindCaptivePortalChanged(bool state);
+    void transportMediumChanged(TransportMedium current);
+    void isMeteredChanged(bool isMetered);
 
 private:
+    friend struct QNetworkInformationDeleter;
     friend class QNetworkInformationPrivate;
     QNetworkInformation(QNetworkInformationBackend *backend);
+    ~QNetworkInformation() override;
 
     Q_DISABLE_COPY_MOVE(QNetworkInformation)
 };