From 005d70a73c0c98f224d5cdee3a471c558d0528eb Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <danimo@owncloud.com>
Date: Fri, 11 Oct 2013 14:24:18 +0200
Subject: [PATCH] Proxy support: Reset useSystemConfiguration() in all cases
 but DefaultProxy

Fixes #1016
---
 src/mirall/application.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp
index 45cc1073c6..6b0f5ecf97 100644
--- a/src/mirall/application.cpp
+++ b/src/mirall/application.cpp
@@ -517,6 +517,7 @@ void Application::slotSetupProxy()
 
     switch(proxyType) {
     case QNetworkProxy::NoProxy:
+        QNetworkProxyFactory::setUseSystemConfiguration(false);
         QNetworkProxy::setApplicationProxy(QNetworkProxy::NoProxy);
         break;
     case QNetworkProxy::DefaultProxy:
@@ -524,10 +525,12 @@ void Application::slotSetupProxy()
         break;
     case QNetworkProxy::Socks5Proxy:
         proxy.setType(QNetworkProxy::Socks5Proxy);
+        QNetworkProxyFactory::setUseSystemConfiguration(false);
         QNetworkProxy::setApplicationProxy(proxy);
         break;
     case QNetworkProxy::HttpProxy:
         proxy.setType(QNetworkProxy::HttpProxy);
+        QNetworkProxyFactory::setUseSystemConfiguration(false);
         QNetworkProxy::setApplicationProxy(proxy);
         break;
     default: