network manager: restore proxy detection

qgis · Feb 23, 2014 · 5d7179f · 5d7179f
1 parent 5a25570
commit 5d7179f
Showing 1 changed file with 34 additions and 20 deletions.
diff --git a/src/core/qgsnetworkaccessmanager.cpp b/src/core/qgsnetworkaccessmanager.cpp
@@ -263,29 +263,43 @@ void QgsNetworkAccessManager::setupDefaultProxyAndCache()
     if ( proxyTypeString == "DefaultProxy" )
     {
       proxyType = QNetworkProxy::DefaultProxy;
+
+#if defined(Q_OS_WIN)
+      QNetworkProxyFactory::setUseSystemConfiguration( true );
+      QList<QNetworkProxy> proxies = QNetworkProxyFactory::systemProxyForQuery();
+      if ( !proxies.isEmpty() )
+      {
+        proxy = proxies.first();
+      }
+#endif
+
+      QgsDebugMsg( "setting default proxy" );
     }
-    else if ( proxyTypeString == "Socks5Proxy" )
-    {
-      proxyType = QNetworkProxy::Socks5Proxy;
-    }
-    else if ( proxyTypeString == "HttpProxy" )
-    {
-      proxyType = QNetworkProxy::HttpProxy;
-    }
-    else if ( proxyTypeString == "HttpCachingProxy" )
-    {
-      proxyType = QNetworkProxy::HttpCachingProxy;
-    }
-    else if ( proxyTypeString == "FtpCachingProxy" )
+    else
     {
-      proxyType = QNetworkProxy::FtpCachingProxy;
+      if ( proxyTypeString == "Socks5Proxy" )
+      {
+	proxyType = QNetworkProxy::Socks5Proxy;
+      }
+      else if ( proxyTypeString == "HttpProxy" )
+      {
+	proxyType = QNetworkProxy::HttpProxy;
+      }
+      else if ( proxyTypeString == "HttpCachingProxy" )
+      {
+	proxyType = QNetworkProxy::HttpCachingProxy;
+      }
+      else if ( proxyTypeString == "FtpCachingProxy" )
+      {
+	proxyType = QNetworkProxy::FtpCachingProxy;
+      }
+      QgsDebugMsg( QString( "setting proxy %1 %2:%3 %4/%5" )
+	  .arg( proxyType )
+	  .arg( proxyHost ).arg( proxyPort )
+	  .arg( proxyUser ).arg( proxyPassword )
+	  );
+      proxy = QNetworkProxy( proxyType, proxyHost, proxyPort, proxyUser, proxyPassword );
     }
-    QgsDebugMsg( QString( "setting proxy %1 %2:%3 %4/%5" )
-                 .arg( proxyType )
-                 .arg( proxyHost ).arg( proxyPort )
-                 .arg( proxyUser ).arg( proxyPassword )
-               );
-    proxy = QNetworkProxy( proxyType, proxyHost, proxyPort, proxyUser, proxyPassword );
   }
 
 #if QT_VERSION >= 0x40500