diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-03-27 08:57:43 +0100 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-03-27 08:58:05 +0100 |
commit | c8316825b9961bbf1c5677c192c708bef2ef7e06 (patch) | |
tree | 701ef8659d37fe8fee8f37f6e2db82734c21f106 | |
parent | 3216d71dae42126c3d730ce56b616abebd1c5b87 (diff) | |
parent | b13fec3c7ed08b7d0e79c08312a3c3285eb20ef3 (diff) | |
download | qtlocation-c8316825b9961bbf1c5677c192c708bef2ef7e06.tar.gz |
Merge remote-tracking branch 'gerrit/5.4' into 5.5
Change-Id: I417d5faf3bb02b3c0936b36cbf54f9e9c67d3ea1
-rw-r--r-- | src/imports/location/qdeclarativegeomap.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index 1370e4a9..ffd608fa 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -552,12 +552,15 @@ QDeclarativeGeoServiceProvider *QDeclarativeGeoMap::plugin() const void QDeclarativeGeoMap::setMinimumZoomLevel(qreal minimumZoomLevel) { if (gestureArea_ && minimumZoomLevel >= 0) { + qreal oldMinimumZoomLevel = this->minimumZoomLevel(); if (mappingManagerInitialized_ && minimumZoomLevel < mappingManager_->cameraCapabilities().minimumZoomLevel()) { minimumZoomLevel = mappingManager_->cameraCapabilities().minimumZoomLevel(); } gestureArea_->setMinimumZoomLevel(minimumZoomLevel); setZoomLevel(qBound<qreal>(minimumZoomLevel, zoomLevel(), maximumZoomLevel())); + if (oldMinimumZoomLevel != minimumZoomLevel) + emit minimumZoomLevelChanged(); } } @@ -588,12 +591,15 @@ qreal QDeclarativeGeoMap::minimumZoomLevel() const void QDeclarativeGeoMap::setMaximumZoomLevel(qreal maximumZoomLevel) { if (gestureArea_ && maximumZoomLevel >= 0) { + qreal oldMaximumZoomLevel = this->maximumZoomLevel(); if (mappingManagerInitialized_ && maximumZoomLevel > mappingManager_->cameraCapabilities().maximumZoomLevel()) { maximumZoomLevel = mappingManager_->cameraCapabilities().maximumZoomLevel(); } gestureArea_->setMaximumZoomLevel(maximumZoomLevel); setZoomLevel(qBound<qreal>(minimumZoomLevel(), zoomLevel(), maximumZoomLevel)); + if (oldMaximumZoomLevel != maximumZoomLevel) + emit maximumZoomLevelChanged(); } } |