diff options
author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-01-27 16:34:53 +0100 |
---|---|---|
committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-01-30 05:29:35 +0100 |
commit | 7321a2c624d1a3bdc0825cf3d09a51643fe83d77 (patch) | |
tree | 6b88dacf0c4dde20b66a844077a2dbd377940732 /src/network/access/qnetworkaccessmanager_p.h | |
parent | 4df303ece7ce69a0e8dc2d14b59637048d7214ec (diff) |
QNetworkAccessManager: deprecate bearer related functions
In Qt6 QNAM will no longer use bearer in any way so we deprecate it now.
Also mark bearermanagement-conditioned sections for removal in Qt6,
the _q_networksession property is part of how QNAM passes the
QNetworkSession around.
Task-number: QTBUG-81609
Change-Id: I04aad9dd96482c6822dffba1b9af7aa58961149c
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/access/qnetworkaccessmanager_p.h')
-rw-r--r-- | src/network/access/qnetworkaccessmanager_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/network/access/qnetworkaccessmanager_p.h b/src/network/access/qnetworkaccessmanager_p.h index da92cad704..7926463d56 100644 --- a/src/network/access/qnetworkaccessmanager_p.h +++ b/src/network/access/qnetworkaccessmanager_p.h @@ -62,7 +62,7 @@ #include "QtNetwork/qnetworkproxy.h" #include "QtNetwork/qnetworksession.h" #include "qnetworkaccessauthenticationmanager_p.h" -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section #include "QtNetwork/qnetworkconfigmanager.h" #endif @@ -87,7 +87,7 @@ public: #ifndef QT_NO_NETWORKPROXY proxyFactory(nullptr), #endif -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section lastSessionState(QNetworkSession::Invalid), networkConfiguration(networkConfigurationManager.defaultConfiguration()), customNetworkConfiguration(false), @@ -102,7 +102,7 @@ public: redirectPolicy(QNetworkRequest::ManualRedirectPolicy), authenticationManager(QSharedPointer<QNetworkAccessAuthenticationManager>::create()) { -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section // we would need all active configurations to check for // d->networkConfigurationManager.isOnline(), which is asynchronous // and potentially expensive. We can just check the configuration here @@ -153,7 +153,7 @@ public: QStringList backendSupportedSchemes() const; void _q_onlineStateChanged(bool isOnline); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section void createSession(const QNetworkConfiguration &config); QSharedPointer<QNetworkSession> getNetworkSession() const; @@ -186,7 +186,7 @@ public: QNetworkProxyFactory *proxyFactory; #endif -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section QSharedPointer<QNetworkSession> networkSessionStrongRef; QWeakPointer<QNetworkSession> networkSessionWeakRef; QNetworkSession::State lastSessionState; @@ -231,7 +231,7 @@ public: int transferTimeout = 0; -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section Q_AUTOTEST_EXPORT static const QWeakPointer<const QNetworkSession> getNetworkSession(const QNetworkAccessManager *manager); #endif Q_DECLARE_PUBLIC(QNetworkAccessManager) |