summaryrefslogtreecommitdiff
path: root/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
diff options
context:
space:
mode:
authorLauri Laanmets <lauri.laanmets@eesti.ee>2021-09-30 16:06:43 +0300
committerIvan Solovev <ivan.solovev@qt.io>2021-11-09 10:28:48 +0100
commit6ae370ac2e2a894f5181df9d5b027896812afaa5 (patch)
tree37b1d4e3f4d5fd7b9f16216bd8f323a38a337a46 /src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
parentb9f167d7aea56a1ea4b5cafb4bcda763bf7a0e5e (diff)
downloadqtlocation-6ae370ac2e2a894f5181df9d5b027896812afaa5.tar.gz
Change QGeoPolygon 'path' to 'perimeter'
https://doc.qt.io/qt-6/qtpositioning-changes-qt6.html#rename-qgeopolygon-path This is part of a bigger work to port QtLocation maps to Qt6. Task-number: QTBUG-96795 Change-Id: I34f27f7e21a3e4243b7fc08a93bc6e95d0541814 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Diffstat (limited to 'src/location/declarativemaps/qdeclarativepolylinemapitem.cpp')
-rw-r--r--src/location/declarativemaps/qdeclarativepolylinemapitem.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
index 88ebef25..ee05503e 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
@@ -751,9 +751,9 @@ void QGeoMapPolylineGeometryOpenGL::updateSourcePoints(const QGeoMap &map, const
{
if (!sourceDirty_)
return;
- QGeoPath p(poly.path());
- if (poly.path().size() && poly.path().last() != poly.path().first())
- p.addCoordinate(poly.path().first());
+ QGeoPath p(poly.perimeter());
+ if (poly.perimeter().size() && poly.perimeter().last() != poly.perimeter().first())
+ p.addCoordinate(poly.perimeter().first());
updateSourcePoints(map, p);
}
@@ -798,7 +798,7 @@ void QGeoMapPolylineGeometryOpenGL::updateSourcePoints(const QGeoProjectionWebMe
}
QGeoPolygon bbox(QGeoRectangle(topLeft, bottomRight));
QList<QDoubleVector2D> wrappedBbox, wrappedBboxPlus1, wrappedBboxMinus1;
- QDeclarativeGeoMapItemUtils::wrapPath(bbox.path(), bbox.boundingGeoRectangle().topLeft(), p,
+ QDeclarativeGeoMapItemUtils::wrapPath(bbox.perimeter(), bbox.boundingGeoRectangle().topLeft(), p,
wrappedBbox, wrappedBboxMinus1, wrappedBboxPlus1, &m_bboxLeftBoundWrapped);
// New pointers, some old LOD task might still be running and operating on the old pointers.