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/maps/qgeoserviceprovider_p.h | |
| 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/maps/qgeoserviceprovider_p.h')
| -rw-r--r-- | src/location/maps/qgeoserviceprovider_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |