diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:54:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-28 08:38:23 +0100 |
| commit | ba9b7b9ef674d93680070f6c4bb1053d0d2325dd (patch) | |
| tree | 685b1717d2ff6112149c2797190990dc59053f43 /src/imports/location | |
| parent | a98315f652518cb6f2d0a2845dc1d1581c3dbbc0 (diff) | |
| parent | e2ece6d1283926c5a91362933719f3d10efa2ed5 (diff) | |
| download | qtlocation-ba9b7b9ef674d93680070f6c4bb1053d0d2325dd.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
Change-Id: I44fd4bd47f97acd7ca5a0bdb235a701a59497528
Diffstat (limited to 'src/imports/location')
| -rw-r--r-- | src/imports/location/qdeclarativegeomap.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index 1cdde85c..0450bf56 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -888,6 +888,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: |