summaryrefslogtreecommitdiff
path: root/src/imports
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-24 19:36:23 +0100
committerLiang Qi <liang.qi@qt.io>2016-11-24 19:36:23 +0100
commite2ece6d1283926c5a91362933719f3d10efa2ed5 (patch)
tree5fa62a28a909fd74dbbe31fcba29dc3c5f8e74bb /src/imports
parentf0c46685091fade417f118bfdc8ccdcbb4e9b9ce (diff)
parent78c73ebf88fbb97ebb796fc71e76232af5c8f1d3 (diff)
downloadqtlocation-e2ece6d1283926c5a91362933719f3d10efa2ed5.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Change-Id: I49b1b3fc94819b5a7f2fd1ab2481a1d8ea41586b
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/location/qdeclarativegeomap.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
index 53d607fb..dbea220f 100644
--- a/src/imports/location/qdeclarativegeomap.cpp
+++ b/src/imports/location/qdeclarativegeomap.cpp
@@ -890,6 +890,9 @@ void QDeclarativeGeoMap::fitViewportToGeoShape()
QGeoRectangle rect = m_region;
topLeft = rect.topLeft();
bottomRight = rect.bottomRight();
+ if (bottomRight.longitude() < topLeft.longitude())
+ bottomRight.setLongitude(bottomRight.longitude() + 360.0);
+
break;
}
case QGeoShape::CircleType: