Add support to match against QObject properties in DelegateChooser

Views could use an array of QObject instances as a model, as an alterative to a
QAIM subclass; but DelegateChooser only supported querying the value based on the
model role name. Now a QObject property name can also be used as roleValue.

[ChangeLog][QtQuick][Item Views] DelegateChooser now supports using a property name
as roleValue when an array of QObject instances is used as the model for a view.

Fixes: QTBUG-81580
Change-Id: I3e5b57ce0456520667e342741efbe46417f0843c
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 9 insertions, 3 deletions

diff --git a/src/imports/labsmodels/qqmldelegatecomponent.cpp b/src/imports/labsmodels/qqmldelegatecomponent.cpp
index 4698287fe3..aaf3fea5da 100644
--- a/src/imports/labsmodels/qqmldelegatecomponent.cpp
+++ b/src/imports/labsmodels/qqmldelegatecomponent.cpp
@@ -218,7 +218,7 @@ bool QQmlDelegateChoice::match(int row, int column, const QVariant &value) const
 
 /*!
     \qmlproperty string QtQml.Models::DelegateChooser::role
-    This property holds the role used to determine the delegate for a given model item.
+    This property holds the role or the property name used to determine the delegate for a given model item.
 
     \sa DelegateChoice
 */
@@ -289,9 +289,15 @@ QQmlComponent *QQmlDelegateChooser::delegate(QQmlAdaptorModel *adaptorModel, int
         v = value(adaptorModel, row, column, m_role);
     if (!v.isValid()) { // check if the row only has modelData, for example if the row is a QVariantMap
         v = value(adaptorModel, row, column, QStringLiteral("modelData"));
-        if (v.isValid())
-            v = v.toMap().value(m_role);
+
+        if (v.isValid()) {
+            if (v.canConvert(QMetaType::QVariantMap))
+                v = v.toMap().value(m_role);
+            else if (v.canConvert(QMetaType::QObjectStar))
+                v = v.value<QObject*>()->property(m_role.toUtf8());
+        }
     }
+
     // loop through choices, finding first one that fits
     for (int i = 0; i < m_choices.count(); ++i) {
         const QQmlDelegateChoice *choice = m_choices.at(i);