From 6dd11e806bdfe09182ae4ba94779c51b193aad85 Mon Sep 17 00:00:00 2001
From: Will Grant <william.grant@grolloaerospace.com.au>
Date: Mon, 23 May 2016 10:05:18 +1000
Subject: [PATCH] use system proxy settings when fetching maps

---
 src/QtLocationPlugin/QGCMapUrlEngine.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/QtLocationPlugin/QGCMapUrlEngine.cpp b/src/QtLocationPlugin/QGCMapUrlEngine.cpp
index 2d4ab4cf9..c86b6eb0c 100644
--- a/src/QtLocationPlugin/QGCMapUrlEngine.cpp
+++ b/src/QtLocationPlugin/QGCMapUrlEngine.cpp
@@ -46,6 +46,8 @@ UrlFactory::UrlFactory()
     if (langs.length() > 0) {
         _language = langs[0];
     }
+
+    QNetworkProxyFactory::setUseSystemConfiguration(true);
     // Google version strings
     _versionGoogleMap            = "m@336";
     _versionGoogleSatellite      = "194";
@@ -446,7 +448,7 @@ UrlFactory::_tryCorrectGoogleVersions(QNetworkAccessManager*  networkManager)
         QNetworkRequest qheader;
         QNetworkProxy proxy = networkManager->proxy();
         QNetworkProxy tProxy;
-        tProxy.setType(QNetworkProxy::NoProxy);
+        tProxy.setType(QNetworkProxy::DefaultProxy);
         networkManager->setProxy(tProxy);
         QString url = "http://maps.google.com/maps";
         qheader.setUrl(QUrl(url));
-- 
2.22.0