JSON: use QJsonValueConstRef

This restores the containers' constness that was temporarily disabled.

Change-Id: I5e52dc5b093c43a3b678fffd16b642bab6c50521
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

2 files changed, 6 insertions, 6 deletions

diff --git a/src/qml/qml/qqmlpluginimporter.cpp b/src/qml/qml/qqmlpluginimporter.cpp
index 7723630e1d..fbb691c48e 100644
--- a/src/qml/qml/qqmlpluginimporter.cpp
+++ b/src/qml/qml/qqmlpluginimporter.cpp
@@ -507,7 +507,7 @@ bool QQmlPluginImporter::populatePluginDataVector(QVector<StaticPluginData> &res
         QObject *instance = plugin.instance();
         if (qobject_cast<QQmlEngineExtensionPlugin *>(instance)
                 || qobject_cast<QQmlExtensionPlugin *>(instance)) {
-            QJsonArray metaTagsUriList = plugin.metaData().value(
+            const QJsonArray metaTagsUriList = plugin.metaData().value(
                         QStringLiteral("uri")).toArray();
             if (metaTagsUriList.isEmpty()) {
                 if (errors) {
@@ -523,7 +523,7 @@ bool QQmlPluginImporter::populatePluginDataVector(QVector<StaticPluginData> &res
                 return false;
             }
             // A plugin can be set up to handle multiple URIs, so go through the list:
-            for (const QJsonValueRef metaTagUri : metaTagsUriList) {
+            for (const QJsonValueConstRef metaTagUri : metaTagsUriList) {
                 if (versionUris.contains(metaTagUri.toString())) {
                     result.append({ plugin, metaTagsUriList });
                     break;
@@ -585,8 +585,8 @@ QTypeRevision QQmlPluginImporter::importPlugins() {
                 return QTypeRevision();
 
             for (const QString &versionUri : versionUris) {
-                for (StaticPluginData &pair : pluginPairs) {
-                    for (QJsonValueRef metaTagUri : pair.uriList) {
+                for (const StaticPluginData &pair : qAsConst(pluginPairs)) {
+                    for (const QJsonValueConstRef metaTagUri : pair.uriList) {
                         if (versionUri == metaTagUri.toString()) {
                             staticPluginsFound++;
                             QObject *instance = pair.plugin.instance();
diff --git a/src/qmltyperegistrar/qmltyperegistrar.cpp b/src/qmltyperegistrar/qmltyperegistrar.cpp
index 2ed75d1a6c..e5d1bb95d6 100644
--- a/src/qmltyperegistrar/qmltyperegistrar.cpp
+++ b/src/qmltyperegistrar/qmltyperegistrar.cpp
@@ -328,8 +328,8 @@ int main(int argc, char **argv)
         QString targetName = className;
         QString extendedName;
         bool seenQmlElement = false;
-        QJsonArray classInfos = classDef.value(QLatin1String("classInfos")).toArray();
-        for (const QJsonValueRef v : classInfos) {
+        const QJsonArray classInfos = classDef.value(QLatin1String("classInfos")).toArray();
+        for (const QJsonValueConstRef v : classInfos) {
             const QString name = v[QStringLiteral("name")].toString();
             if (name == QStringLiteral("QML.Element"))
                 seenQmlElement = true;