From 70089a870144377298b04fd13c8f0b76ddb9cb6b Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 22 Aug 2022 11:06:32 +0200 Subject: [PATCH] QmlDesigner: Fix compile fix Amends 82a010f67a4a653d. Turns out that 04dc959d49e5e3 in Qt 6.4 introduces a source incompatibility intentionally. Use 'auto' to cover old and new behavior. Change-Id: I4cf69393e0c1a483261b3f283b6bce97f664e3ce Reviewed-by: Eike Ziller --- .../components/materialbrowser/materialbrowsermodel.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowsermodel.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowsermodel.cpp index 052557eb97b..658d1ceae0b 100644 --- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowsermodel.cpp +++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowsermodel.cpp @@ -360,13 +360,15 @@ void MaterialBrowserModel::copyMaterialProperties(int idx, const QString §io if (propsSpecObj.contains(section)) { // should always be true m_copiedMaterialProps.clear(); const QJsonArray propNames = propsSpecObj.value(section).toArray(); - for (const QJsonValueConstRef &propName : propNames) + // auto == QJsonValueConstRef after 04dc959d49e5e3 / Qt 6.4, QJsonValueRef before + for (const auto &propName : propNames) m_copiedMaterialProps.append(mat.property(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(); - for (const QJsonValueConstRef &propName : propNames) + // auto == QJsonValueConstRef after 04dc959d49e5e3 / Qt 6.4, QJsonValueRef before + for (const auto &propName : propNames) m_copiedMaterialProps.append(mat.property(propName.toString().toLatin1())); } }