diff options
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); } } |