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/qgeotilefetcher_nokia.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/qgeotilefetcher_nokia.cpp')
| -rw-r--r-- | src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp index 9fe4120a..ad4e56d6 100644 --- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp @@ -55,6 +55,7 @@ #include <QNetworkAccessManager> #include <QNetworkProxy> +#include <QNetworkProxyFactory> #include <QSize> #include <QDir> #include <QUrl> @@ -91,7 +92,7 @@ bool QGeoTileFetcherNokia::init() if (proxy.isEmpty()) proxy = m_parameters.value("mapping.proxy").toString(); - if (!proxy.isEmpty()) { + if (!proxy.isEmpty() && proxy.toLower() != QLatin1String("system")) { QUrl proxyUrl(proxy); if (proxyUrl.isValid()) { m_networkManager->setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, @@ -100,6 +101,9 @@ bool QGeoTileFetcherNokia::init() proxyUrl.userName(), proxyUrl.password())); } + } else if (!proxy.isEmpty()) { + if (QNetworkProxy::applicationProxy().type() == QNetworkProxy::NoProxy) + QNetworkProxyFactory::setUseSystemConfiguration(true); } } |