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/qhttpnetworkconnection_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/qhttpnetworkconnection_p.h')
| -rw-r--r-- | src/network/access/qhttpnetworkconnection_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index 6808a0c0ac..845b55bc5d 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -101,7 +101,7 @@ public: ConnectionTypeHTTP2Direct }; -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section explicit QHttpNetworkConnection(const QString &hostName, quint16 port = 80, bool encrypt = false, ConnectionType connectionType = ConnectionTypeHTTP, QObject *parent = nullptr, QSharedPointer<QNetworkSession> networkSession @@ -292,7 +292,7 @@ public: QSharedPointer<QSslContext> sslContext; #endif -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section QSharedPointer<QNetworkSession> networkSession; #endif |