summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2020-01-28 10:06:06 +0100
committerMårten Nordheim <marten.nordheim@qt.io>2020-01-30 19:56:21 +0100
commit6a1df2d2060bfa346398f6125f33a4ff1b190a64 (patch)
tree1f4ef03913324c6ab851b6f523c23d22e6d35169
parent2e7a28958da2be6875ab6a5329871665ca340a04 (diff)
QNetworkProxy/doc: Remove mention of network configuration
The support for QNetworkConfiguration was deprecated in 5.10 but the documentation was still alluding to the functionality. Change-Id: I7597388c646196fb4744d7bac4f890ca582c5b75 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--src/network/kernel/qnetworkproxy.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index 90c8b75a86..3cabdd0bd5 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -241,7 +241,7 @@
#include "qstringlist.h"
#include "qurl.h"
-#ifndef QT_NO_BEARERMANAGEMENT
+#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section
#include <QtNetwork/QNetworkConfiguration>
#endif
@@ -984,11 +984,6 @@ template<> void QSharedDataPointer<QNetworkProxyQueryPrivate>::detach()
like choosing an caching HTTP proxy for HTTP-based connections,
but a more powerful SOCKSv5 proxy for all others.
- The network configuration specifies which configuration to use,
- when bearer management is used. For example on a mobile phone
- the proxy settings are likely to be different for the cellular
- network vs WLAN.
-
Some of the criteria may not make sense in all of the types of
query. The following table lists the criteria that are most
commonly used, according to the type of query.