From 8dd711a9e9dd88195bc85d3e15b30dd1384aebae Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Fri, 5 Jan 2018 16:29:24 +0200 Subject: Use custom namespace in QtLocation's earcut The custom namespace avoids clashes with mapbox-gl-native's own earcut.hpp dependency. Task-number: QTBUG-65262 Change-Id: Ic5121e88dca45c01af7ce26e38a99a0cd2d1c88e Reviewed-by: Paolo Angelelli --- src/location/declarativemaps/qdeclarativepolygonmapitem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/location/declarativemaps') diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp index 7460a376..6b58a061 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 indices = mapbox::earcut(polygon); + std::vector indices = qt_mapbox::earcut(polygon); for (const auto &i: indices) screenIndices_ << quint32(i); } -- cgit v1.2.3