Skip to content

Commit 19f03b1

Browse files
authored
Merge pull request vladest#3 from CMGeorge/master
Fix compile on WinRT and Windows Runtime.
2 parents 79ce213 + 9dba9c7 commit 19f03b1

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

qgeotilefetchergooglemaps.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,12 @@ void QGeoTileFetcherGooglemaps::_tryCorrectGoogleVersions(QNetworkAccessManager*
199199
if(networkManager)
200200
{
201201
QNetworkRequest qheader;
202+
#ifndef QT_NO_NETWORKPROXY
202203
QNetworkProxy proxy = networkManager->proxy();
203204
QNetworkProxy tProxy;
204205
tProxy.setType(QNetworkProxy::DefaultProxy);
205206
networkManager->setProxy(tProxy);
207+
#endif
206208
QSslConfiguration conf = qheader.sslConfiguration();
207209
conf.setPeerVerifyMode(QSslSocket::VerifyNone);
208210
qheader.setSslConfiguration(conf);
@@ -214,7 +216,9 @@ void QGeoTileFetcherGooglemaps::_tryCorrectGoogleVersions(QNetworkAccessManager*
214216
connect(_googleReply, &QNetworkReply::destroyed, this, &QGeoTileFetcherGooglemaps::_replyDestroyed);
215217
connect(_googleReply, static_cast<void (QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error),
216218
this, &QGeoTileFetcherGooglemaps::_networkReplyError);
219+
#ifndef QT_NO_NETWORKPROXY
217220
networkManager->setProxy(proxy);
221+
#endif
218222
}
219223
}
220224

0 commit comments

Comments
 (0)