diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-02-14 12:07:18 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-04-01 21:35:12 +0100 |
| commit | 4888e3e8401dc2e949f7e575c0e1e0036d746af6 (patch) | |
| tree | a669832b289e0bb17eb511d4042d20136b2269e9 /src/network/access/qnetworkaccessbackend.cpp | |
| parent | ab91ac09924f7e356e4d2b8cf40c89a3c12011bb (diff) | |
Remove bearermanagement usage inside QNAM and QNetworkProxy
Change-Id: I2c4fdf598b46daf1b69a65848ebe0fd78ef8be24
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/access/qnetworkaccessbackend.cpp')
| -rw-r--r-- | src/network/access/qnetworkaccessbackend.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp index 9d7e7200fa..8013785cc1 100644 --- a/src/network/access/qnetworkaccessbackend.cpp +++ b/src/network/access/qnetworkaccessbackend.cpp @@ -39,13 +39,11 @@ #include "qnetworkaccessbackend_p.h" #include "qnetworkaccessmanager_p.h" -#include "qnetworkconfigmanager.h" #include "qnetworkrequest.h" #include "qnetworkreply.h" #include "qnetworkreply_p.h" #include "QtCore/qmutex.h" #include "QtCore/qstringlist.h" -#include "QtNetwork/private/qnetworksession_p.h" #include "qnetworkaccesscachebackend_p.h" #include "qabstractnetworkcache.h" @@ -371,30 +369,6 @@ void QNetworkAccessBackend::sslErrors(const QList<QSslError> &errors) */ bool QNetworkAccessBackend::start() { -#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section - // For bearer, check if session start is required - QSharedPointer<QNetworkSession> networkSession(manager->getNetworkSession()); - if (networkSession) { - // session required - if (networkSession->isOpen() && - networkSession->state() == QNetworkSession::Connected) { - // Session is already open and ready to use. - // copy network session down to the backend - setProperty("_q_networksession", QVariant::fromValue(networkSession)); - } else { - // Session not ready, but can skip for loopback connections - - // This is not ideal. - // Don't need an open session for localhost access. - if (!reply->url.isLocalFile()) { - const QString host = reply->url.host(); - if (host != QLatin1String("localhost") && !QHostAddress(host).isLoopback()) - return false; // need to wait for session to be opened - } - } - } -#endif - #ifndef QT_NO_NETWORKPROXY reply->proxyList = manager->queryProxy(QNetworkProxyQuery(url())); #endif |