diff options
author | Cristian Adam <cristian.adam@nokia.com> | 2012-03-21 19:23:54 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-29 02:29:53 +0200 |
commit | 66f381098a27421978a739334f23794de0e4768d (patch) | |
tree | fbe73949e1bc3eaf1619e56689ab8cafa4411726 /src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp | |
parent | 6cdedaf13ccd44fad6729e43b4b79d75572fe9ca (diff) | |
download | qtlocation-66f381098a27421978a739334f23794de0e4768d.tar.gz |
Added support for proxy autodetection.
Change-Id: Icef793831e54f0333e9872293859b9009a7164cf
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
Diffstat (limited to 'src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp')
-rw-r--r-- | src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp index d716b29f..fe43d6ed 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp @@ -59,6 +59,7 @@ #include <QtCore/QJsonDocument> #include <QtCore/QJsonObject> #include <QtNetwork/QNetworkProxy> +#include <QtNetwork/QNetworkProxyFactory> #ifdef USE_CHINA_NETWORK_REGISTRATION #include <QtSystemInfo/QNetworkInfo> #endif @@ -99,7 +100,7 @@ QPlaceManagerEngineNokiaV2::QPlaceManagerEngineNokiaV2(const QMap<QString, QVari if (proxy.isEmpty()) proxy = parameters.value("places.proxy").toString(); - if (!proxy.isEmpty()) { + if (!proxy.isEmpty() && proxy.toLower() != QLatin1String("system")) { QUrl proxyUrl(proxy); if (proxyUrl.isValid()) { m_manager->setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, @@ -108,6 +109,9 @@ QPlaceManagerEngineNokiaV2::QPlaceManagerEngineNokiaV2(const QMap<QString, QVari proxyUrl.userName(), proxyUrl.password())); } + } else if (!proxy.isEmpty()) { + if (QNetworkProxy::applicationProxy().type() == QNetworkProxy::NoProxy) + QNetworkProxyFactory::setUseSystemConfiguration(true); } } |