From fbebc93617d99d2bf8fed559f17dba8bed15a063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 14 Feb 2020 16:41:57 +0100 Subject: 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 Reviewed-by: Qt CI Bot --- src/network/kernel/qnetworkproxy.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/network/kernel/qnetworkproxy.h') 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: -- cgit v1.2.3