diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2016-11-02 13:14:00 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2016-11-02 13:14:06 +0100 |
| commit | 1c0b494ae0d780230e2ed410ef74353dc1a2ea77 (patch) | |
| tree | dedac7c676ebd9dafdfc2879e5a330e4f69ba367 /src/imports/location/qdeclarativepolygonmapitem.cpp | |
| parent | 315b4325d0b55d1104d1615fa6f7ecc12465f8f2 (diff) | |
| parent | 16423f84f970d7dac644a4b041e3ebe2ac0f6e22 (diff) | |
Merge remote-tracking branch 'gerrit/5.7' into 5.8
Conflicts:
tests/auto/declarative_ui/BLACKLIST
Change-Id: I0f6c9228c899c4d1d55fffc596c661ee0f6c2b66
Diffstat (limited to 'src/imports/location/qdeclarativepolygonmapitem.cpp')
| -rw-r--r-- | src/imports/location/qdeclarativepolygonmapitem.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/imports/location/qdeclarativepolygonmapitem.cpp b/src/imports/location/qdeclarativepolygonmapitem.cpp index d997f590..a42892b7 100644 --- a/src/imports/location/qdeclarativepolygonmapitem.cpp +++ b/src/imports/location/qdeclarativepolygonmapitem.cpp @@ -431,6 +431,8 @@ void QDeclarativePolygonMapItem::setPath(const QJSValue &value) path_ = pathList; geoLeftBound_ = QDeclarativePolylineMapItem::getLeftBound(path_, deltaXs_, minX_); + geometry_.setPreserveGeometry(true, geoLeftBound_); + borderGeometry_.setPreserveGeometry(true, geoLeftBound_); geometry_.markSourceDirty(); borderGeometry_.markSourceDirty(); polishAndUpdate(); @@ -449,6 +451,8 @@ void QDeclarativePolygonMapItem::addCoordinate(const QGeoCoordinate &coordinate) { path_.append(coordinate); geoLeftBound_ = QDeclarativePolylineMapItem::getLeftBound(path_, deltaXs_, minX_, geoLeftBound_); + geometry_.setPreserveGeometry(true, geoLeftBound_); + borderGeometry_.setPreserveGeometry(true, geoLeftBound_); geometry_.markSourceDirty(); borderGeometry_.markSourceDirty(); polishAndUpdate(); @@ -473,6 +477,8 @@ void QDeclarativePolygonMapItem::removeCoordinate(const QGeoCoordinate &coordina path_.removeAt(index); geoLeftBound_ = QDeclarativePolylineMapItem::getLeftBound(path_, deltaXs_, minX_); + geometry_.setPreserveGeometry(true, geoLeftBound_); + borderGeometry_.setPreserveGeometry(true, geoLeftBound_); geometry_.markSourceDirty(); borderGeometry_.markSourceDirty(); polishAndUpdate(); |