diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-04-10 13:49:59 +0300 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-04-10 11:52:15 +0000 |
| commit | f982dda0cedeae1f52dbcd5dce32ff0d478e0c8a (patch) | |
| tree | e0c94207d948294e7cadba84ac916c09d69ea545 /src/location/declarativemaps | |
| parent | 00c3f6aed3cdf9db4f3c8e176c6c1b97ce1272bc (diff) | |
| download | qtlocation-f982dda0cedeae1f52dbcd5dce32ff0d478e0c8a.tar.gz | |
Rename libclipper namespace
So it won't clash with the libclipper used by the Mapbox GL plugin
when linking Qt with -static.
With -static, all the plugins are linked together instead of each
one having its own shared library, thus, hiding private symbols.
Change-Id: I33ee4afd4b83741c5f3fae32a88da7f4a7fee75f
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/location/declarativemaps')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativecirclemapitem.cpp | 4 | ||||
| -rw-r--r-- | src/location/declarativemaps/qdeclarativepolygonmapitem.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp index 9aae03fa..274225c0 100644 --- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp +++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp @@ -181,7 +181,7 @@ void QGeoMapCircleGeometry::updateScreenPointsInvert(const QList<QDoubleVector2D c2t::clip2tri clipper; clipper.addSubjectPath(QClipperUtils::qListToPath(fill), true); clipper.addClipPolygon(QClipperUtils::qListToPath(hole)); - Paths difference = clipper.execute(c2t::clip2tri::Difference, ClipperLib::pftEvenOdd, ClipperLib::pftEvenOdd); + Paths difference = clipper.execute(c2t::clip2tri::Difference, QtClipperLib::pftEvenOdd, QtClipperLib::pftEvenOdd); // 2) QDoubleVector2D lb = map.geoProjection().geoToWrappedMapProjection(srcOrigin_); @@ -192,7 +192,7 @@ void QGeoMapCircleGeometry::updateScreenPointsInvert(const QList<QDoubleVector2D for (const Path &p: difference) clipper.addSubjectPath(p, true); clipper.addClipPolygon(QClipperUtils::qListToPath(visibleRegion)); - Paths res = clipper.execute(c2t::clip2tri::Intersection, ClipperLib::pftEvenOdd, ClipperLib::pftEvenOdd); + Paths res = clipper.execute(c2t::clip2tri::Intersection, QtClipperLib::pftEvenOdd, QtClipperLib::pftEvenOdd); clippedPaths = QClipperUtils::pathsToQList(res); // 2.1) update srcOrigin_ with the point with minimum X/Y diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp index 5cd57dcb..0b93a294 100644 --- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp +++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp @@ -190,7 +190,7 @@ void QGeoMapPolygonGeometry::updateSourcePoints(const QGeoMap &map, c2t::clip2tri clipper; clipper.addSubjectPath(QClipperUtils::qListToPath(wrappedPath), true); clipper.addClipPolygon(QClipperUtils::qListToPath(visibleRegion)); - Paths res = clipper.execute(c2t::clip2tri::Intersection, ClipperLib::pftEvenOdd, ClipperLib::pftEvenOdd); + Paths res = clipper.execute(c2t::clip2tri::Intersection, QtClipperLib::pftEvenOdd, QtClipperLib::pftEvenOdd); clippedPaths = QClipperUtils::pathsToQList(res); // 2.1) update srcOrigin_ and leftBoundWrapped with the point with minimum X |