From 317ed0a7e6dd69136186897427b30f1fcdca7def Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@nokia.com>
Date: Thu, 8 Dec 2011 11:48:58 +0100
Subject: Fix windows proxy setting again.

Broke with 4edec9f9.

Change-Id: I1dfad5964f7d36566de0874d19e7ca94e3b92054
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
(cherry picked from commit b2c73f6e18a18d143445a163b358d1700eef5d32)
---
 src/app/main.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/main.cpp b/src/app/main.cpp
index d42dc045a9..ca82f957b5 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -282,11 +282,13 @@ int main(int argc, char **argv)
                             proxyUrl.port(), proxyUrl.userName(), proxyUrl.password());
         QNetworkProxy::setApplicationProxy(proxy);
     }
-#if defined(Q_OS_MAC)
+# if defined(Q_OS_MAC) // unix and mac
     else {
         QNetworkProxyFactory::setUseSystemConfiguration(true);
     }
-#endif
+# endif
+#else // windows
+    QNetworkProxyFactory::setUseSystemConfiguration(true);
 #endif
     // Load
     const QStringList pluginPaths = getPluginPaths();
-- 
cgit v1.2.1