From bf6cffde943293674a063feda56f4564dd07414b Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Fri, 4 Nov 2016 16:36:44 +0100
Subject: Only use system proxy if QNetworkProxy::useSystemConfiguration() says
 so

This allows users to disable _any_ proxy globally by calling
QNetworkProxy::setUseSystemConfiguration(false).

Change-Id: If6f5d978316b603c53520512dac1eac57ab6c176
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
---
 src/core/proxy_config_service_qt.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/core')

diff --git a/src/core/proxy_config_service_qt.cpp b/src/core/proxy_config_service_qt.cpp
index 28a36d37f..5bc30b6bc 100644
--- a/src/core/proxy_config_service_qt.cpp
+++ b/src/core/proxy_config_service_qt.cpp
@@ -109,7 +109,8 @@ net::ProxyConfigService::ConfigAvailability ProxyConfigServiceQt::GetLatestProxy
     }
     m_qtApplicationProxy = qtProxy;
     m_qtProxyConfig = net::ProxyConfig();
-    if (qtProxy.type() == QNetworkProxy::NoProxy) {
+    if (qtProxy.type() == QNetworkProxy::NoProxy
+            && QNetworkProxyFactory::usesSystemConfiguration()) {
         *config = systemConfig;
         return systemAvailability;
     }
-- 
cgit v1.2.3