diff options
author | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:54:57 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:55:56 +0200 |
commit | 40b8d8f0b1c4d3dfdb63994f1c5d9e16760496f7 (patch) | |
tree | 0ad7002074b2996460d72722435c97d76ddc6466 /src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp | |
parent | 420139a36dace3bb8f78f2d65b30f7657668d888 (diff) | |
parent | 5542c721af400750b13bd411dfbb13891f49618e (diff) | |
download | qtlocation-40b8d8f0b1c4d3dfdb63994f1c5d9e16760496f7.tar.gz |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I3241efba9c3a32a4a097a67fd6432c45aad8e6ef
Diffstat (limited to 'src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp')
-rw-r--r-- | src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp index ad3ab375..c82b98f3 100644 --- a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp +++ b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp @@ -364,11 +364,11 @@ void QGeoMapMapboxGL::onMapChanged(QMapboxGL::MapChange change) d->m_styleLoaded = false; d->m_styleChanges.clear(); - for (QGeoMapParameter *param : d->m_mapParameters) - d->m_styleChanges << QMapboxGLStyleChange::addMapParameter(param); - for (QDeclarativeGeoMapItemBase *item : d->m_mapItems) d->m_styleChanges << QMapboxGLStyleChange::addMapItem(item, d->m_mapItemsBefore); + + for (QGeoMapParameter *param : d->m_mapParameters) + d->m_styleChanges << QMapboxGLStyleChange::addMapParameter(param); } } |