qmlmodels: Expose QModelIndex::data() to QML

QAbstractItemModel::data() is invokable, too.

Change-Id: I4eb32ab8956b94260aae1a4374edfddd95a0b126
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

3 files changed, 6 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlitemmodels/data/modelindex.qml b/tests/auto/qml/qqmlitemmodels/data/modelindex.qml
index 2756f04120..7bf8bfb5a2 100644
--- a/tests/auto/qml/qqmlitemmodels/data/modelindex.qml
+++ b/tests/auto/qml/qqmlitemmodels/data/modelindex.qml
@@ -8,6 +8,7 @@ ItemModelsTest {
     property var parent: modelIndex.parent
     property var model: modelIndex.model
     property var internalId: modelIndex.internalId
+    property var displayData: modelIndex.data(Qt.DisplayRole)
 
     onSignalWithModelIndex: {
         isValid = index.valid
@@ -16,5 +17,6 @@ ItemModelsTest {
         parent = index.parent
         model = index.model
         internalId = index.internalId
+        displayData = index.data(Qt.DisplayRole)
     }
 }
diff --git a/tests/auto/qml/qqmlitemmodels/data/persistentmodelindex.qml b/tests/auto/qml/qqmlitemmodels/data/persistentmodelindex.qml
index 85987bdcac..aa43252100 100644
--- a/tests/auto/qml/qqmlitemmodels/data/persistentmodelindex.qml
+++ b/tests/auto/qml/qqmlitemmodels/data/persistentmodelindex.qml
@@ -8,6 +8,7 @@ ItemModelsTest {
     property var parent: persistentModelIndex.parent
     property var model: persistentModelIndex.model
     property var internalId: persistentModelIndex.internalId
+    property var displayData: persistentModelIndex.data(Qt.DisplayRole)
 
     property var pmi
 
@@ -18,6 +19,7 @@ ItemModelsTest {
         parent = index.parent
         model = index.model
         internalId = index.internalId
+        displayData = index.data(Qt.DisplayRole)
 
         pmi = createPersistentModelIndex(model.index(0, 0))
     }
diff --git a/tests/auto/qml/qqmlitemmodels/tst_qqmlitemmodels.cpp b/tests/auto/qml/qqmlitemmodels/tst_qqmlitemmodels.cpp
index 339a61f996..936d4ac8a8 100644
--- a/tests/auto/qml/qqmlitemmodels/tst_qqmlitemmodels.cpp
+++ b/tests/auto/qml/qqmlitemmodels/tst_qqmlitemmodels.cpp
@@ -55,6 +55,7 @@ void tst_qqmlitemmodels::modelIndex()
         QCOMPARE(object->property("parent").toModelIndex(), index.parent());
         QCOMPARE(object->property("model").value<QAbstractItemModel *>(), index.model());
         QCOMPARE(object->property("internalId").toULongLong(), index.internalId());
+        QCOMPARE(object->property("displayData"), index.data(Qt::DisplayRole));
 
         if (i < 3) {
             index = model.index(2 + i, 4 - i, index);
@@ -79,6 +80,7 @@ void tst_qqmlitemmodels::persistentModelIndex()
         QCOMPARE(object->property("parent").toModelIndex(), index.parent());
         QCOMPARE(object->property("model").value<QAbstractItemModel *>(), index.model());
         QCOMPARE(object->property("internalId").toULongLong(), index.internalId());
+        QCOMPARE(object->property("displayData"), index.data(Qt::DisplayRole));
 
         if (i < 2) {
             index = model.index(2 + i, 4 - i, index);