diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-09-11 17:15:45 +0200 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-09-11 17:16:16 +0200 |
| commit | a0c7b93df620d9254aef3136da08adbc70752837 (patch) | |
| tree | 0db63a9d7f693d5245056eb41a1128c5fec11187 /src/location/declarativemaps/qdeclarativegeomapitemview.cpp | |
| parent | 3f2c6d8af0367c5e87eb38d348c99e2e2a2f0a76 (diff) | |
| parent | b13ff055eb64970f545ba590735a38652de7689b (diff) | |
| download | qtlocation-a0c7b93df620d9254aef3136da08adbc70752837.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1
Change-Id: Ibcf748d5f0d172ad5c77bdcd41806009ff6914e3
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeomapitemview.cpp')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeomapitemview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp index d8c19528..24ed6700 100644 --- a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp +++ b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp @@ -378,7 +378,7 @@ void QDeclarativeGeoMapItemView::setAutoFitViewport(const bool &fitViewport) */ void QDeclarativeGeoMapItemView::fitViewport() { - if (!map_ || !fitViewport_ || m_repopulating) + if (!map_ || !map_->mapReady() || !fitViewport_ || m_repopulating) return; if (map_->mapItems().size() > 0) |