diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2016-12-05 12:43:52 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2016-12-05 12:43:52 +0100 |
| commit | 335116ea024f51e1693bba39f78e15131870f1b0 (patch) | |
| tree | 148ccdb4703b4a35afb1b0e3875573b1eb90d0ce /src/imports/location/qdeclarativepolygonmapitem.cpp | |
| parent | 5e4bc1fe908896e9b90e8ad9c3896f35b5ec37be (diff) | |
| parent | ba9b7b9ef674d93680070f6c4bb1053d0d2325dd (diff) | |
Merge remote-tracking branch 'gerrit/5.8' into dev
Conflicts:
src/imports/location/qdeclarativegeomap.cpp
src/location/maps/maps.pri
src/location/maps/qgeomap_p_p.h
src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
src/plugins/geoservices/osm/qgeoroutereplyosm.cpp
Change-Id: I18d31cff9233648178fe3e2636ce294026dfaeb7
Diffstat (limited to 'src/imports/location/qdeclarativepolygonmapitem.cpp')
| -rw-r--r-- | src/imports/location/qdeclarativepolygonmapitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/location/qdeclarativepolygonmapitem.cpp b/src/imports/location/qdeclarativepolygonmapitem.cpp index 50dce35f..41196770 100644 --- a/src/imports/location/qdeclarativepolygonmapitem.cpp +++ b/src/imports/location/qdeclarativepolygonmapitem.cpp @@ -208,7 +208,7 @@ void QGeoMapPolygonGeometry::updateScreenPoints(const QGeoMap &map) if (!screenDirty_) return; - if (map.width() == 0 || map.height() == 0) { + if (map.viewportWidth() == 0 || map.viewportHeight() == 0) { clear(); return; } @@ -217,7 +217,7 @@ void QGeoMapPolygonGeometry::updateScreenPoints(const QGeoMap &map) // Create the viewport rect in the same coordinate system // as the actual points - QRectF viewport(0, 0, map.width(), map.height()); + QRectF viewport(0, 0, map.viewportWidth(), map.viewportHeight()); viewport.translate(-1 * origin.toPointF()); QPainterPath vpPath; |