summaryrefslogtreecommitdiffstats
path: root/src/network/access/qhttpnetworkconnection_p.h
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2020-02-14 12:07:18 +0100
committerMårten Nordheim <marten.nordheim@qt.io>2020-04-01 21:35:12 +0100
commit4888e3e8401dc2e949f7e575c0e1e0036d746af6 (patch)
treea669832b289e0bb17eb511d4042d20136b2269e9 /src/network/access/qhttpnetworkconnection_p.h
parentab91ac09924f7e356e4d2b8cf40c89a3c12011bb (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/qhttpnetworkconnection_p.h')
-rw-r--r--src/network/access/qhttpnetworkconnection_p.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index cfce3ecc00..7aecbba2a4 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -55,7 +55,6 @@
#include <QtNetwork/qnetworkrequest.h>
#include <QtNetwork/qnetworkreply.h>
#include <QtNetwork/qabstractsocket.h>
-#include <QtNetwork/qnetworksession.h>
#include <qhttp2configuration.h>
@@ -100,23 +99,12 @@ public:
ConnectionTypeHTTP2Direct
};
-#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
- = QSharedPointer<QNetworkSession>());
- QHttpNetworkConnection(quint16 channelCount, const QString &hostName, quint16 port = 80,
- bool encrypt = false, QObject *parent = nullptr,
- QSharedPointer<QNetworkSession> networkSession = QSharedPointer<QNetworkSession>(),
- ConnectionType connectionType = ConnectionTypeHTTP);
-#else
explicit QHttpNetworkConnection(const QString &hostName, quint16 port = 80, bool encrypt = false,
ConnectionType connectionType = ConnectionTypeHTTP,
QObject *parent = 0);
QHttpNetworkConnection(quint16 channelCount, const QString &hostName, quint16 port = 80,
bool encrypt = false, QObject *parent = 0,
ConnectionType connectionType = ConnectionTypeHTTP);
-#endif
~QHttpNetworkConnection();
//The hostname to which this is connected to.
@@ -290,10 +278,6 @@ public:
QSharedPointer<QSslContext> sslContext;
#endif
-#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section
- QSharedPointer<QNetworkSession> networkSession;
-#endif
-
QHttp2Configuration http2Parameters;
QString peerVerifyName;