summaryrefslogtreecommitdiffstats
path: root/src/network/socket/qabstractsocket_p.h
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2018-10-29 15:08:30 +0100
committerAndy Shaw <andy.shaw@qt.io>2018-12-10 12:16:48 +0000
commite25d7b14416b2d0ac2598bc03a7c2b8d96e63d42 (patch)
tree73bcf1dd6e5b8cc7807f7eb7b28ec94800a238ce /src/network/socket/qabstractsocket_p.h
parent3464e1e5c7b5b01ae13c99e3529dd02af1d36958 (diff)
Add a means to specify the protocol type, to aid websockets over proxy
When a PAC script is used on macOS, it will only allow connections for http/https, although a proxy can be used for ws/wss. Therefore we need to add a means of setting the protocol type for this sort of connection so that we can pass on the necessary information to the PAC script. Change-Id: I3fa29fa85a529bd88d9565daa58fe9d748b61a92 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/socket/qabstractsocket_p.h')
-rw-r--r--src/network/socket/qabstractsocket_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h
index 066a35ff85..38c0caef49 100644
--- a/src/network/socket/qabstractsocket_p.h
+++ b/src/network/socket/qabstractsocket_p.h
@@ -124,6 +124,7 @@ public:
#ifndef QT_NO_NETWORKPROXY
QNetworkProxy proxy;
QNetworkProxy proxyInUse;
+ QString protocolTag;
void resolveProxy(const QString &hostName, quint16 port);
#else
inline void resolveProxy(const QString &, quint16) { }