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/positioning/qgeopositioninfosource.cpp | |
| 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/positioning/qgeopositioninfosource.cpp')
| -rw-r--r-- | src/positioning/qgeopositioninfosource.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/positioning/qgeopositioninfosource.cpp b/src/positioning/qgeopositioninfosource.cpp index 1f9abec1..56ee66d7 100644 --- a/src/positioning/qgeopositioninfosource.cpp +++ b/src/positioning/qgeopositioninfosource.cpp @@ -143,9 +143,9 @@ QVariant QGeoPositionInfoSourcePrivate::backendProperty(const QString &/*name*/) return QVariant(); } -QHash<QString, QJsonObject> QGeoPositionInfoSourcePrivate::plugins(bool reload) +QMultiHash<QString, QJsonObject> QGeoPositionInfoSourcePrivate::plugins(bool reload) { - static QHash<QString, QJsonObject> plugins; + static QMultiHash<QString, QJsonObject> plugins; static bool alreadyDiscovered = false; if (reload == true) @@ -179,7 +179,7 @@ QList<QJsonObject> QGeoPositionInfoSourcePrivate::pluginsSorted() return list; } -void QGeoPositionInfoSourcePrivate::loadPluginMetadata(QHash<QString, QJsonObject> &plugins) +void QGeoPositionInfoSourcePrivate::loadPluginMetadata(QMultiHash<QString, QJsonObject> &plugins) { QFactoryLoader *l = loader(); QList<QJsonObject> meta = l->metaData(); @@ -192,7 +192,7 @@ void QGeoPositionInfoSourcePrivate::loadPluginMetadata(QHash<QString, QJsonObjec continue; } obj.insert(QStringLiteral("index"), i); - plugins.insertMulti(obj.value(QStringLiteral("Provider")).toString(), obj); + plugins.insert(obj.value(QStringLiteral("Provider")).toString(), obj); } } |