QNetworkProxyFactory: Never return empty list on windows

Task-number: Salesforce 00062670
Reviewed-by: Thiago

1 files changed, 6 insertions, 1 deletions

diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp
index f0fff2f493..2100215955 100644
--- a/src/network/kernel/qnetworkproxy_win.cpp
+++ b/src/network/kernel/qnetworkproxy_win.cpp
@@ -398,7 +398,12 @@ QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkPro
     if (isBypassed(query.peerHostName(), sp->proxyBypass))
         return sp->defaultResult;
 
-    return parseServerList(query, sp->proxyServerList);
+    QList<QNetworkProxy> result = parseServerList(query, sp->proxyServerList);
+    // In some cases, this was empty. See SF task 00062670
+    if (result.isEmpty())
+        return sp->defaultResult;
+
+    return result;
 }
 
 #else  // !UNICODE