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/ssl/qsslsocket.cpp | |
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/ssl/qsslsocket.cpp')
-rw-r--r-- | src/network/ssl/qsslsocket.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 8fa9f914a2..4ed1951c7d 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -2519,7 +2519,7 @@ void QSslSocketPrivate::createPlainSocket(QIODevice::OpenMode openMode) q->setPeerName(QString()); plainSocket = new QTcpSocket(q); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section //copy network session down to the plain socket (if it has been set) plainSocket->setProperty("_q_networksession", q->property("_q_networksession")); #endif |