diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 15:00:15 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 15:00:15 +0100 |
| commit | 741d90b31650d71d7ea7a7cc9e83b1ab36e060c5 (patch) | |
| tree | a0a0a7c2f1c1340066a76db21db7d32202e8a203 /src/plugins/geoservices | |
| parent | d8adb9630d3c3d6796f6f679f0634fd880b91ecf (diff) | |
| parent | d47ce931797cde751a7df9802acc9917e54ff694 (diff) | |
| download | qtlocation-741d90b31650d71d7ea7a7cc9e83b1ab36e060c5.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ia876d943c684fbefddd693f00a16b2f2cec18223
Diffstat (limited to 'src/plugins/geoservices')
| -rw-r--r-- | src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/geoservices/osm/qplacesearchreplyosm.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp index b0967499..9c088f2f 100644 --- a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp +++ b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp @@ -234,7 +234,7 @@ void QGeoMapMapboxGLPrivate::addMapItem(QDeclarativeGeoMapItemBase *item) QObject::connect(mapItem, &QQuickItem::visibleChanged, q, &QGeoMapMapboxGL::onMapItemPropertyChanged); QObject::connect(mapItem, &QDeclarativeGeoMapItemBase::mapItemOpacityChanged, q, &QGeoMapMapboxGL::onMapItemPropertyChanged); QObject::connect(mapItem, &QDeclarativePolygonMapItem::pathChanged, q, &QGeoMapMapboxGL::onMapItemGeometryChanged); - QObject::connect(mapItem, &QDeclarativePolygonMapItem::colorChanged, q, &QGeoMapMapboxGL::onMapItemGeometryChanged); + QObject::connect(mapItem, &QDeclarativePolygonMapItem::colorChanged, q, &QGeoMapMapboxGL::onMapItemPropertyChanged); QObject::connect(mapItem->border(), &QDeclarativeMapLineProperties::colorChanged, q, &QGeoMapMapboxGL::onMapItemSubPropertyChanged); QObject::connect(mapItem->border(), &QDeclarativeMapLineProperties::widthChanged, q, &QGeoMapMapboxGL::onMapItemUnsupportedPropertyChanged); } break; diff --git a/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp b/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp index d65b0735..366ff852 100644 --- a/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp +++ b/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp @@ -184,7 +184,7 @@ QPlaceResult QPlaceSearchReplyOsm::parsePlaceResult(const QJsonObject &item) con //double importance = item.value(QStringLiteral("importance")).toDouble(); place.setAttribution(item.value(QStringLiteral("licence")).toString()); - place.setPlaceId(item.value(QStringLiteral("place_id")).toString()); + place.setPlaceId(QString::number(item.value(QStringLiteral("place_id")).toInt())); QVariantMap iconParameters; iconParameters.insert(QPlaceIcon::SingleUrl, |