Deprecate public bearer classes

The WARNING_PUSH/POP in QNetworkProxy is needed because it triggers
a warning when compiled which means a warning gets printed under
compilation which means tst_bic fails.

[ChangeLog][Deprecation Notice][QtNetwork] QNetworkConfigurationManager,
QNetworkConfiguration and QNetworkSession are deprecated, to be removed
in Qt 6.

Change-Id: Ife87722045ea10adf667388a1bf94c4f9bc8d5f0
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

8 files changed, 64 insertions, 4 deletions

diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp
index 751735c8bd..990f033db4 100644
--- a/src/network/bearer/qnetworkconfigmanager.cpp
+++ b/src/network/bearer/qnetworkconfigmanager.cpp
@@ -110,6 +110,7 @@ QNetworkConfigurationManagerPrivate *qNetworkConfigurationManagerPrivate()
 
 /*!
     \class QNetworkConfigurationManager
+    \obsolete
 
     \brief The QNetworkConfigurationManager class manages the network configurations provided
     by the system.
diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h
index e8866999c7..1bd2a4a034 100644
--- a/src/network/bearer/qnetworkconfigmanager.h
+++ b/src/network/bearer/qnetworkconfigmanager.h
@@ -40,16 +40,31 @@
 #ifndef QNETWORKCONFIGMANAGER_H
 #define QNETWORKCONFIGMANAGER_H
 
+#if 0
+#pragma qt_class(QNetworkConfigurationManager)
+#endif
+
 #include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qobject.h>
 #include <QtNetwork/qnetworkconfiguration.h>
 
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
+
 #ifndef QT_NO_BEARERMANAGEMENT
 
 QT_BEGIN_NAMESPACE
 
 class QNetworkConfigurationManagerPrivate;
-class Q_NETWORK_EXPORT QNetworkConfigurationManager : public QObject
+// We work around an issue in ICC where it errors out during compilation of Qt by not marking it
+// deprecated if ICC is used
+#ifdef Q_CC_INTEL
+#define QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC
+#else
+#define QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC QT_DEPRECATED_VERSION_5_15
+#endif
+class QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC Q_NETWORK_EXPORT QNetworkConfigurationManager : public QObject
+#undef QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC
 {
     Q_OBJECT
 
@@ -97,4 +112,6 @@ QT_END_NAMESPACE
 
 #endif // QT_NO_BEARERMANAGEMENT
 
+QT_WARNING_POP
+
 #endif // QNETWORKCONFIGMANAGER_H
diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp
index 25c4ab711e..841615db6a 100644
--- a/src/network/bearer/qnetworkconfiguration.cpp
+++ b/src/network/bearer/qnetworkconfiguration.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QNetworkConfiguration
+    \obsolete
 
     \brief The QNetworkConfiguration class provides an abstraction of one or more access point configurations.
 
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h
index 048abc2fc8..0469508d9d 100644
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -40,6 +40,10 @@
 #ifndef QNETWORKCONFIGURATION_H
 #define QNETWORKCONFIGURATION_H
 
+#if 0
+#pragma qt_class(QNetworkConfiguration)
+#endif
+
 #include <QtNetwork/qtnetworkglobal.h>
 
 #include <QtCore/qshareddata.h>
@@ -47,10 +51,21 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qmetatype.h>
 
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
+
 QT_BEGIN_NAMESPACE
 
 class QNetworkConfigurationPrivate;
-class Q_NETWORK_EXPORT QNetworkConfiguration
+// We work around an issue in ICC where it errors out during compilation of Qt by not marking it
+// deprecated if ICC is used
+#ifdef Q_CC_INTEL
+#define QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC
+#else
+#define QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC QT_DEPRECATED_VERSION_5_15
+#endif
+class QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC Q_NETWORK_EXPORT QNetworkConfiguration
+#undef QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC
 {
 public:
     QNetworkConfiguration();
@@ -135,4 +150,6 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QNetworkConfiguration)
 
+QT_WARNING_POP
+
 #endif // QNETWORKCONFIGURATION_H
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index 324016d72a..1d055689ab 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -59,6 +59,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QNetworkSession
+    \obsolete
 
     \brief The QNetworkSession class provides control over the system's access points
     and enables session management for cases when multiple clients access the same access point.
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h
index 1b5ae9098b..37fe7948ad 100644
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -40,6 +40,10 @@
 #ifndef QNETWORKSESSION_H
 #define QNETWORKSESSION_H
 
+#if 0
+#pragma qt_class(QNetworkSession)
+#endif
+
 #include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
@@ -47,6 +51,9 @@
 #include <QtCore/qvariant.h>
 #include <QtNetwork/qnetworkconfiguration.h>
 
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
+
 #ifndef QT_NO_BEARERMANAGEMENT
 
 #if defined(Q_OS_WIN) && defined(interface)
@@ -57,7 +64,15 @@
 QT_BEGIN_NAMESPACE
 
 class QNetworkSessionPrivate;
-class Q_NETWORK_EXPORT QNetworkSession : public QObject
+// We work around an issue in ICC where it errors out during compilation of Qt by not marking it
+// deprecated if ICC is used
+#ifdef Q_CC_INTEL
+#define QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC
+#else
+#define QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC QT_DEPRECATED_VERSION_5_15
+#endif
+class QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC Q_NETWORK_EXPORT QNetworkSession : public QObject
+#undef QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC
 {
     Q_OBJECT
 
@@ -147,4 +162,6 @@ Q_DECLARE_METATYPE(QNetworkSession::UsagePolicies)
 
 #endif // QT_NO_BEARERMANAGEMENT
 
+QT_WARNING_POP
+
 #endif // QNETWORKSESSION_H
diff --git a/src/network/configure.json b/src/network/configure.json
index 496401749f..d3e5009f45 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -387,7 +387,7 @@
             "output": [ "publicFeature", "feature" ]
         },
         "bearermanagement": {
-            "label": "Bearer management",
+            "label": "Bearer management (deprecated)",
             "purpose": "Provides bearer management for the network stack.",
             "section": "Networking",
             "condition": "features.thread && features.library && features.networkinterface && features.properties",
diff --git a/src/network/kernel/qnetworkproxy.h b/src/network/kernel/qnetworkproxy.h
index 302a2ce6ca..d267e744e3 100644
--- a/src/network/kernel/qnetworkproxy.h
+++ b/src/network/kernel/qnetworkproxy.h
@@ -76,6 +76,8 @@ public:
     explicit QNetworkProxyQuery(quint16 bindPort, const QString &protocolTag = QString(),
                        QueryType queryType = TcpServer);
 #if !defined(QT_NO_BEARERMANAGEMENT) && QT_DEPRECATED_SINCE(5, 10)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     Q_DECL_DEPRECATED_X("QNetworkConfiguration support in QNetworkProxy is deprecated")
     QNetworkProxyQuery(const QNetworkConfiguration &networkConfiguration,
                        const QUrl &requestUrl, QueryType queryType = UrlRequest);
@@ -87,6 +89,7 @@ public:
     QNetworkProxyQuery(const QNetworkConfiguration &networkConfiguration,
                        quint16 bindPort, const QString &protocolTag = QString(),
                        QueryType queryType = TcpServer);
+QT_WARNING_POP
 #endif
     QNetworkProxyQuery(const QNetworkProxyQuery &other);
     QNetworkProxyQuery &operator=(QNetworkProxyQuery &&other) noexcept { swap(other); return *this; }
@@ -118,10 +121,13 @@ public:
     void setUrl(const QUrl &url);
 
 #if !defined(QT_NO_BEARERMANAGEMENT) && QT_DEPRECATED_SINCE(5, 10)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     Q_DECL_DEPRECATED_X("QNetworkConfiguration support in QNetworkProxy is deprecated")
     QNetworkConfiguration networkConfiguration() const;
     Q_DECL_DEPRECATED_X("QNetworkConfiguration support in QNetworkProxy is deprecated")
     void setNetworkConfiguration(const QNetworkConfiguration &networkConfiguration);
+QT_WARNING_POP
 #endif
 
 private: