diff options
| -rw-r--r-- | src/plugin/extensionloader.cpp | 6 | ||||
| -rw-r--r-- | src/plugin/extensionloader.h | 4 | ||||
| -rw-r--r-- | src/plugin/plugin.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/plugin/extensionloader.cpp b/src/plugin/extensionloader.cpp index e3f1b28e..6b41f328 100644 --- a/src/plugin/extensionloader.cpp +++ b/src/plugin/extensionloader.cpp @@ -35,14 +35,14 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { QMutex ExtensionLoader::m_mutex; -QHash<QString, QJsonObject> ExtensionLoader::m_plugins; +QMultiHash<QString, QJsonObject> ExtensionLoader::m_plugins; bool ExtensionLoader::m_alreadyDiscovered = false; Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QVirtualKeyboardExtensionPluginFactoryInterface_iid, QLatin1String("/virtualkeyboard"))) -QHash<QString, QJsonObject> ExtensionLoader::plugins(bool reload) +QMultiHash<QString, QJsonObject> ExtensionLoader::plugins(bool reload) { QMutexLocker lock(&m_mutex); @@ -105,7 +105,7 @@ void ExtensionLoader::loadPluginMetadata() QString name = obj.value(QLatin1String("Name")).toString(); if (!name.isEmpty()) { obj.insert(QLatin1String("index"), i); - m_plugins.insertMulti(name, obj); + m_plugins.insert(name, obj); } } } diff --git a/src/plugin/extensionloader.h b/src/plugin/extensionloader.h index 4d18ad30..8cdb49bd 100644 --- a/src/plugin/extensionloader.h +++ b/src/plugin/extensionloader.h @@ -40,7 +40,7 @@ class ExtensionLoader { Q_DISABLE_COPY(ExtensionLoader) public: - static QHash<QString, QJsonObject> plugins(bool reload = false); + static QMultiHash<QString, QJsonObject> plugins(bool reload = false); static QJsonObject loadMeta(const QString &extensionName); static QVirtualKeyboardExtensionPlugin *loadPlugin(QJsonObject metaData); @@ -49,7 +49,7 @@ private: private: static QMutex m_mutex; - static QHash<QString, QJsonObject> m_plugins; + static QMultiHash<QString, QJsonObject> m_plugins; static bool m_alreadyDiscovered; }; diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp index 2c50d324..bf58bc2f 100644 --- a/src/plugin/plugin.cpp +++ b/src/plugin/plugin.cpp @@ -78,7 +78,7 @@ QPlatformInputContext *QVirtualKeyboardPlugin::create(const QString &system, con qmlRegisterType<PlainInputMethod>(pluginsUri, 2, 0, "PlainInputMethod"); qmlRegisterType<PlainInputMethod>(pluginsUri, 2, 3, "PlainInputMethod"); - QHash<QString, QJsonObject> extensions = ExtensionLoader::plugins(); + QMultiHash<QString, QJsonObject> extensions = ExtensionLoader::plugins(); for (const QString &extensionName : extensions.uniqueKeys()) { QJsonObject metaData = ExtensionLoader::loadMeta(extensionName); if (metaData.isEmpty()) { |