diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-26 10:02:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-26 10:18:14 +0100 |
| commit | 518633da419d6cfaf603773b9e8c5840e783bc4a (patch) | |
| tree | 326ffd3f5497be64e38fa420af016867ada00538 /src/3rdparty/earcut/earcut.hpp | |
| parent | 9283a290040fd55f7eb34580b99f771d4facdeb4 (diff) | |
| parent | 68b5ee9e7064f66fd7e7bd69b4b51229dbe8cc3c (diff) | |
| download | qtlocation-518633da419d6cfaf603773b9e8c5840e783bc4a.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
tests/plugins/declarativetestplugin/testhelper.h
Change-Id: Ie218ab1dc68642a6922e05e5688c20b90440b72e
Diffstat (limited to 'src/3rdparty/earcut/earcut.hpp')
| -rw-r--r-- | src/3rdparty/earcut/earcut.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/earcut/earcut.hpp b/src/3rdparty/earcut/earcut.hpp index 287be028..ba3fb17a 100644 --- a/src/3rdparty/earcut/earcut.hpp +++ b/src/3rdparty/earcut/earcut.hpp @@ -9,7 +9,7 @@ #include <memory> #include <vector> -namespace mapbox { +namespace qt_mapbox { namespace util { @@ -771,7 +771,7 @@ void Earcut<N>::removeNode(Node* p) { template <typename N = uint32_t, typename Polygon> std::vector<N> earcut(const Polygon& poly) { - mapbox::detail::Earcut<N> earcut; + qt_mapbox::detail::Earcut<N> earcut; earcut(poly); return earcut.indices; } |