diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-07 03:01:46 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-07 03:01:46 +0200 |
commit | a8793c6d9695498b3a53793f21859421262b4541 (patch) | |
tree | a783f6f0a1bd6c8dc5c4c57438da981e6b5dd17f /src/location | |
parent | b06a07cf9fd474e11fbe467047e5fe0322b677f0 (diff) | |
parent | eda2a7c286058176e1906d0ddc88d4e2cfbec55e (diff) | |
download | qtlocation-a8793c6d9695498b3a53793f21859421262b4541.tar.gz |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: If3ebc0821be0d0206522adf8ff10040e80e34414
Diffstat (limited to 'src/location')
-rw-r--r-- | src/location/declarativemaps/qdeclarativegeomap.cpp | 2 | ||||
-rw-r--r-- | src/location/doc/src/plugins/mapboxgl.qdoc | 4 | ||||
-rw-r--r-- | src/location/maps/qgeoserviceprovider.cpp | 8 | ||||
-rw-r--r-- | src/location/maps/qgeoserviceprovider_p.h | 4 |
4 files changed, 11 insertions, 7 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp index 17baf811..e68961e5 100644 --- a/src/location/declarativemaps/qdeclarativegeomap.cpp +++ b/src/location/declarativemaps/qdeclarativegeomap.cpp @@ -1497,7 +1497,7 @@ QMargins QDeclarativeGeoMap::mapMargins() const */ QQmlListProperty<QDeclarativeGeoMapType> QDeclarativeGeoMap::supportedMapTypes() { - return QQmlListProperty<QDeclarativeGeoMapType>(this, m_supportedMapTypes); + return QQmlListProperty<QDeclarativeGeoMapType>(this, &m_supportedMapTypes); } /*! diff --git a/src/location/doc/src/plugins/mapboxgl.qdoc b/src/location/doc/src/plugins/mapboxgl.qdoc index e3ca1a82..3bfd8b97 100644 --- a/src/location/doc/src/plugins/mapboxgl.qdoc +++ b/src/location/doc/src/plugins/mapboxgl.qdoc @@ -88,6 +88,10 @@ The following table lists optional parameters that can be passed to the Mapbox p \l{https://www.mapbox.com/tos}{Terms of Services} and must not be used in production. This property has no effect on styles hosted outside the Mapbox servers. \row + \li mapboxgl.api_base_url + \li Set a custom API base URL. When not set, the URL defaults to \l{https://api.mapbox.com}. + This parameter is ignored if the the \b mapboxgl.china property is set. +\row \li mapboxgl.china \li Use Mapbox China API base URLs and styles. Please notice that Mapbox China requires a specific access token. Contact \l diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp index ec341c44..4873da22 100644 --- a/src/location/maps/qgeoserviceprovider.cpp +++ b/src/location/maps/qgeoserviceprovider.cpp @@ -896,9 +896,9 @@ void QGeoServiceProviderPrivate::loadPlugin(const QVariantMap ¶meters) } } -QHash<QString, QJsonObject> QGeoServiceProviderPrivate::plugins(bool reload) +QMultiHash<QString, QJsonObject> QGeoServiceProviderPrivate::plugins(bool reload) { - static QHash<QString, QJsonObject> plugins; + static QMultiHash<QString, QJsonObject> plugins; static bool alreadyDiscovered = false; if (reload == true) @@ -911,14 +911,14 @@ QHash<QString, QJsonObject> QGeoServiceProviderPrivate::plugins(bool reload) return plugins; } -void QGeoServiceProviderPrivate::loadPluginMetadata(QHash<QString, QJsonObject> &list) +void QGeoServiceProviderPrivate::loadPluginMetadata(QMultiHash<QString, QJsonObject> &list) { QFactoryLoader *l = loader(); QList<QJsonObject> meta = l->metaData(); for (int i = 0; i < meta.size(); ++i) { QJsonObject obj = meta.at(i).value(QStringLiteral("MetaData")).toObject(); obj.insert(QStringLiteral("index"), i); - list.insertMulti(obj.value(QStringLiteral("Provider")).toString(), obj); + list.insert(obj.value(QStringLiteral("Provider")).toString(), obj); } } diff --git a/src/location/maps/qgeoserviceprovider_p.h b/src/location/maps/qgeoserviceprovider_p.h index c6b03ce5..22dcedd6 100644 --- a/src/location/maps/qgeoserviceprovider_p.h +++ b/src/location/maps/qgeoserviceprovider_p.h @@ -121,8 +121,8 @@ public: QLocale locale; bool localeSet; - static QHash<QString, QJsonObject> plugins(bool reload = false); - static void loadPluginMetadata(QHash<QString, QJsonObject> &list); + static QMultiHash<QString, QJsonObject> plugins(bool reload = false); + static void loadPluginMetadata(QMultiHash<QString, QJsonObject> &list); }; QT_END_NAMESPACE |