QmlDesigner: Use QJsonValueConstRef instead of auto

This used to not build on linux. Doesnt seem the case anymore.

Change-Id: Ia58d388bfe4f5cc794b29f8e25a9a8d6b3f229c3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>

5 files changed, 10 insertions, 12 deletions

diff --git a/src/plugins/effectcomposer/compositionnode.cpp b/src/plugins/effectcomposer/compositionnode.cpp
index d939e2283a..a69cd00e07 100644
--- a/src/plugins/effectcomposer/compositionnode.cpp
+++ b/src/plugins/effectcomposer/compositionnode.cpp
@@ -128,7 +128,7 @@ void CompositionNode::parse(const QString &effectName, const QString &qenPath, c
 
     // parse properties
     QJsonArray jsonProps = json.value("properties").toArray();
-    for (const auto /*QJsonValueRef*/ &prop : jsonProps) {
+    for (const QJsonValueConstRef &prop : jsonProps) {
         const auto uniform = new Uniform(effectName, prop.toObject(), qenPath);
         m_unifomrsModel.addUniform(uniform);
         m_uniforms.append(uniform);
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryeffectsmodel.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryeffectsmodel.cpp
index 334c017116..157290c2d5 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryeffectsmodel.cpp
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryeffectsmodel.cpp
@@ -182,7 +182,7 @@ void ContentLibraryEffectsModel::loadBundle()
 
             QStringList files;
             const QJsonArray assetsArr = itemObj.value("files").toArray();
-            for (const auto /*QJson{Const,}ValueRef*/ &asset : assetsArr)
+            for (const QJsonValueConstRef &asset : assetsArr)
                 files.append(asset.toString());
 
             QUrl icon = QUrl::fromLocalFile(bundleDir.filePath(itemObj.value("icon").toString()));
@@ -202,7 +202,7 @@ void ContentLibraryEffectsModel::loadBundle()
 
     QStringList sharedFiles;
     const QJsonArray sharedFilesArr = m_bundleObj.value("sharedFiles").toArray();
-    for (const auto /*QJson{Const,}ValueRef*/ &file : sharedFilesArr)
+    for (const QJsonValueConstRef &file : sharedFilesArr)
         sharedFiles.append(file.toString());
 
     createImporter(bundleDir.path(), bundleId, sharedFiles);
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp
index dd032a6d1f..a2aef7b47f 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp
@@ -284,7 +284,7 @@ void ContentLibraryMaterialsModel::loadMaterialBundle(const QDir &matBundleDir)
 
             QStringList files;
             const QJsonArray assetsArr = matObj.value("files").toArray();
-            for (const auto /*QJson{Const,}ValueRef*/ &asset : assetsArr)
+            for (const QJsonValueConstRef &asset : assetsArr)
                 files.append(asset.toString());
 
             QUrl icon = QUrl::fromLocalFile(matBundleDir.filePath(matObj.value("icon").toString()));
@@ -305,7 +305,7 @@ void ContentLibraryMaterialsModel::loadMaterialBundle(const QDir &matBundleDir)
 
     QStringList sharedFiles;
     const QJsonArray sharedFilesArr = m_matBundleObj.value("sharedFiles").toArray();
-    for (const auto /*QJson{Const,}ValueRef*/ &file : sharedFilesArr)
+    for (const QJsonValueConstRef &file : sharedFilesArr)
         sharedFiles.append(file.toString());
 
     QStringList missingSharedFiles;
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryusermodel.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryusermodel.cpp
index 75ec5c3650..34cbadfb8b 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryusermodel.cpp
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryusermodel.cpp
@@ -311,7 +311,7 @@ void ContentLibraryUserModel::loadMaterialBundle()
 
         QStringList files;
         const QJsonArray assetsArr = matObj.value("files").toArray();
-        for (const auto /*QJson{Const,}ValueRef*/ &asset : assetsArr)
+        for (const QJsonValueConstRef &asset : assetsArr)
             files.append(asset.toString());
 
         QUrl icon = QUrl::fromLocalFile(bundleDir.filePath(matObj.value("icon").toString()));
@@ -327,7 +327,7 @@ void ContentLibraryUserModel::loadMaterialBundle()
 
     QStringList sharedFiles;
     const QJsonArray sharedFilesArr = m_bundleObj.value("sharedFiles").toArray();
-    for (const auto /*QJson{Const,}ValueRef*/ &file : sharedFilesArr)
+    for (const QJsonValueConstRef &file : sharedFilesArr)
         sharedFiles.append(file.toString());
 
     createImporter(bundleDir.path(), m_bundleId, sharedFiles);
diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowsermodel.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowsermodel.cpp
index d36e78512b..2fcd56b669 100644
--- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowsermodel.cpp
+++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowsermodel.cpp
@@ -434,22 +434,20 @@ void MaterialBrowserModel::copyMaterialProperties(int idx, const QString &sectio
         QJsonObject propsSpecObj = m_propertyGroupsObj.value(m_copiedMaterialType).toObject();
         if (propsSpecObj.contains(section)) { // should always be true
            const QJsonArray propNames = propsSpecObj.value(section).toArray();
-           // auto == QJsonValueConstRef after 04dc959d49e5e3 / Qt 6.4, QJsonValueRef before
-           for (const auto &propName : propNames)
+           for (const QJsonValueConstRef &propName : propNames)
                copiedProps.append(propName.toString().toLatin1());
 
            if (section == "Base") { // add QtQuick3D.Material base props as well
                QJsonObject propsMatObj = m_propertyGroupsObj.value("Material").toObject();
                const QJsonArray propNames = propsMatObj.value("Base").toArray();
-               // auto == QJsonValueConstRef after 04dc959d49e5e3 / Qt 6.4, QJsonValueRef before
-               for (const auto &propName : propNames)
+               for (const QJsonValueConstRef &propName : propNames)
                    copiedProps.append(propName.toString().toLatin1());
            }
         }
     }
 
     m_copiedMaterialProps.clear();
-    for (const auto &propName : copiedProps) {
+    for (const PropertyName &propName : copiedProps) {
         PropertyCopyData data;
         data.name = propName;
         data.isValid = m_allPropsCopied || validProps.contains(propName);