Plugins: Fix the port to QPluginParsedMetaData and CBOR

Commit c78599e1777168050d03f76e93f653669c94c023 was incomplete.

Change-Id: I3eb1bd30e0124f89a052fffd16a6f2d82ad568af
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp
index 5976fccf..69c6177b 100644
--- a/src/plugin/plugin.cpp
+++ b/src/plugin/plugin.cpp
@@ -91,18 +91,18 @@ QPlatformInputContext *QVirtualKeyboardPlugin::create(const QString &system, con
     qmlRegisterType<PlainInputMethod>(pluginsUri, 2, 0, "PlainInputMethod");
     qmlRegisterType<PlainInputMethod>(pluginsUri, 2, 3, "PlainInputMethod");
 
-    QMultiHash<QString, QJsonObject> extensions = ExtensionLoader::plugins();
+    QMultiHash<QString, QCborMap> extensions = ExtensionLoader::plugins();
     for (const QString &extensionName : extensions.uniqueKeys()) {
-        QJsonObject metaData = ExtensionLoader::loadMeta(extensionName);
+        QCborMap metaData = ExtensionLoader::loadMeta(extensionName);
         if (metaData.isEmpty()) {
             qCWarning(qlcVirtualKeyboard) << "Error loading extension - metadata not found!";
             continue;
         }
 
-        const QJsonValue &inputMethodValue = metaData.value(QLatin1String("InputMethod"));
+        const QCborValue &inputMethodValue = metaData.value(QLatin1String("InputMethod"));
         QStringList inputMethodValueList;
         if (inputMethodValue.isArray()) {
-            for (const QJsonValue v : inputMethodValue.toArray()) {
+            for (const QCborValue v : inputMethodValue.toArray()) {
                 const QString &inputMethod = v.toString();
                 if (!inputMethod.isEmpty())
                     inputMethodValueList.append(inputMethod);