diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:33:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:33:35 +0200 |
| commit | b47af31d6c9297121729e30f213e4ffc67fb974f (patch) | |
| tree | 0600be16a4735b5bef0aa8f0439c71842c3113c8 /src/imports | |
| parent | a12b4383be3155c98322ce746551217eb7ce50a2 (diff) | |
| parent | 66a6bd9fb20e76ab288e4eef59d06c06a411a471 (diff) | |
| download | qtlocation-b47af31d6c9297121729e30f213e4ffc67fb974f.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Icd4fc726e755bd4ec8ca0bf7631cd481fc3148a8
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/location/location.cpp | 2 | ||||
| -rw-r--r-- | src/imports/location/qdeclarativegeomap.cpp | 5 | ||||
| -rw-r--r-- | src/imports/location/qquickgeomapgesturearea_p.h | 2 | ||||
| -rw-r--r-- | src/imports/positioning/positioning.cpp | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index b42933f0..6405313b 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -83,7 +83,7 @@ class QtLocationDeclarativeModule: public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0" + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "plugin.json") public: diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index 1a624e15..83130b95 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -547,13 +547,14 @@ void QDeclarativeGeoMap::mappingManagerInitialized() //The zoom level limits are only restricted by the plugins values, if the user has set a more //strict zoom level limit before initialization nothing is done here. //minimum zoom level might be changed to limit gray bundaries - if (m_mappingManager->cameraCapabilities().minimumZoomLevel() > m_gestureArea->minimumZoomLevel()) - setMinimumZoomLevel(m_mappingManager->cameraCapabilities().minimumZoomLevel()); if (m_gestureArea->maximumZoomLevel() < 0 || m_mappingManager->cameraCapabilities().maximumZoomLevel() < m_gestureArea->maximumZoomLevel()) setMaximumZoomLevel(m_mappingManager->cameraCapabilities().maximumZoomLevel()); + if (m_mappingManager->cameraCapabilities().minimumZoomLevel() > m_gestureArea->minimumZoomLevel()) + setMinimumZoomLevel(m_mappingManager->cameraCapabilities().minimumZoomLevel()); + // Map tiles are built in this call. m_map->minimumZoom() becomes operational // after this has been called at least once, after creation. diff --git a/src/imports/location/qquickgeomapgesturearea_p.h b/src/imports/location/qquickgeomapgesturearea_p.h index cfd8738e..51c5cc1e 100644 --- a/src/imports/location/qquickgeomapgesturearea_p.h +++ b/src/imports/location/qquickgeomapgesturearea_p.h @@ -242,7 +242,7 @@ private: bool m_enabled; struct Zoom { - Zoom() : m_minimum(-1.0), m_maximum(-1.0), m_start(0.0), m_previous(0.0), + Zoom() : m_minimum(-1.0), m_maximum(20.0), m_start(0.0), m_previous(0.0), maximumChange(4.0) {} qreal m_minimum; qreal m_maximum; diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp index 5137da22..4c54c211 100644 --- a/src/imports/positioning/positioning.cpp +++ b/src/imports/positioning/positioning.cpp @@ -506,7 +506,7 @@ class QtPositioningDeclarativeModule: public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0" + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "plugin.json") public: |