From 6a1df2d2060bfa346398f6125f33a4ff1b190a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Tue, 28 Jan 2020 10:06:06 +0100 Subject: [PATCH] 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 Reviewed-by: Paul Wicking --- src/network/kernel/qnetworkproxy.cpp | 7 +------ 1 file changed, 1 insertion(+), 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 #endif @@ -984,11 +984,6 @@ template<> void QSharedDataPointer::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.