diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-01-05 16:29:24 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <brunoabinader@gmail.com> | 2018-01-09 13:24:46 +0000 |
| commit | 8dd711a9e9dd88195bc85d3e15b30dd1384aebae (patch) | |
| tree | 007415253c5180a0547590fb5588ce2300993a88 /src/location/declarativemaps/qdeclarativepolygonmapitem.cpp | |
| parent | 00483471fc14dc8a99fb64489358bdddb64bd676 (diff) | |
| download | qtlocation-8dd711a9e9dd88195bc85d3e15b30dd1384aebae.tar.gz | |
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 <paolo.angelelli@qt.io>
Diffstat (limited to 'src/location/declarativemaps/qdeclarativepolygonmapitem.cpp')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativepolygonmapitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<N> indices = mapbox::earcut<N>(polygon); + std::vector<N> indices = qt_mapbox::earcut<N>(polygon); for (const auto &i: indices) screenIndices_ << quint32(i); } |