Don't bypass overwritten [set]data() methods in the proxy.

By calling itemData() of the source model directly, the result cannot
contain data provided by the proxy model itself. The base class
implementation however will call data() on the proxy instead.

Change-Id: Ib0ef5f5621457adbfa4bd896a756dfcb98d0ae54
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
index f750b7a9d4..ea0a14c18c 100644
--- a/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
@@ -79,6 +79,8 @@ private slots:
     void reset();
     void dataChanged();
 
+    void itemData();
+
 protected:
     void verifyIdentity(QAbstractItemModel *model, const QModelIndex &parent = QModelIndex());
 
@@ -364,5 +366,29 @@ void tst_QIdentityProxyModel::dataChanged()
     m_proxy->setSourceModel(0);
 }
 
+class AppendStringProxy : public QIdentityProxyModel
+{
+public:
+    QVariant data(const QModelIndex &index, int role) const
+    {
+        const QVariant result = sourceModel()->data(index, role);
+        if (role != Qt::DisplayRole)
+            return result;
+        return result.toString() + "_appended";
+    }
+};
+
+void tst_QIdentityProxyModel::itemData()
+{
+    QStringListModel model(QStringList() << "Monday" << "Tuesday" << "Wednesday");
+    AppendStringProxy proxy;
+    proxy.setSourceModel(&model);
+
+    const QModelIndex topIndex = proxy.index(0, 0);
+    QCOMPARE(topIndex.data(Qt::DisplayRole).toString(), QStringLiteral("Monday_appended"));
+    QCOMPARE(proxy.data(topIndex, Qt::DisplayRole).toString(), QStringLiteral("Monday_appended"));
+    QCOMPARE(proxy.itemData(topIndex).value(Qt::DisplayRole).toString(), QStringLiteral("Monday_appended"));
+}
+
 QTEST_MAIN(tst_QIdentityProxyModel)
 #include "tst_qidentityproxymodel.moc"