summaryrefslogtreecommitdiffstats
path: root/src/plugins/geoservices/osm
diff options
context:
space:
mode:
authorIvan Solovev <ivan.solovev@qt.io>2021-03-23 15:39:36 +0100
committerIvan Solovev <ivan.solovev@qt.io>2021-03-23 15:39:36 +0100
commit4d6e3ba98a09ffb390da90154a2f61085b565d8e (patch)
tree3bc5e33dde21653934875ac9d48e037fe3e309ad /src/plugins/geoservices/osm
parent70ceffff9c008d467f6ce352b89f13f5cc6f45a6 (diff)
parent861e372b6ad81570d4f496e42fb25a6699b72f2f (diff)
Merge branch '5.15' into dev
Diffstat (limited to 'src/plugins/geoservices/osm')
-rw-r--r--src/plugins/geoservices/osm/qgeotileproviderosm.cpp2
-rw-r--r--src/plugins/geoservices/osm/qplacemanagerengineosm.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
index 3f48ff5e..6fb94fc0 100644
--- a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
+++ b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
@@ -342,7 +342,7 @@ void TileProvider::resolveProvider()
request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferNetwork);
QNetworkReply *reply = m_nm->get(request);
connect(reply, SIGNAL(finished()), this, SLOT(onNetworkReplyFinished()) );
- connect(reply, SIGNAL(errorOccured(QNetworkReply::NetworkError)), this, SLOT(onNetworkReplyError(QNetworkReply::NetworkError)));
+ connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(onNetworkReplyError(QNetworkReply::NetworkError)));
}
void TileProvider::handleError(QNetworkReply::NetworkError error)
diff --git a/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp b/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp
index 4c8d566c..c0d467f4 100644
--- a/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp
+++ b/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp
@@ -182,6 +182,7 @@ QPlaceSearchReply *QPlaceManagerEngineOsm::search(const QPlaceSearchRequest &req
requestUrl.setQuery(queryItems);
QNetworkRequest rq(requestUrl);
+ rq.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
QNetworkReply *networkReply = m_networkManager->get(rq);
QPlaceSearchReplyOsm *reply = new QPlaceSearchReplyOsm(request, networkReply, this);