Merge remote-tracking branch 'origin/5.10' into 5.11

 Conflicts:
	src/location/declarativemaps/qdeclarativegeomap.cpp
	src/location/maps/qgeomap.cpp
	src/location/maps/qgeomap_p_p.h
	src/location/maps/qgeorouteparserosrmv5.cpp
	src/location/maps/qgeotiledmap.cpp
	src/positioning/positioning.pro

Change-Id: I42f8b176a8f3e824c7fe5b067a958735173f0dbb

1 files changed, 1 insertions, 1 deletions

diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
index aa3a3bd9..5eda137c 100644
--- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
@@ -304,7 +304,7 @@ void QGeoMapPolygonGeometry::updateScreenPoints(const QGeoMap &map)
         screenIndices_.clear();
         for (const auto &p : poly)
             screenVertices_ << QPointF(p[0], p[1]);
-        std::vector<N> indices = mapbox::earcut<N>(polygon);
+        std::vector<N> indices = qt_mapbox::earcut<N>(polygon);
         for (const auto &i: indices)
             screenIndices_ << quint32(i);
     }