From b01248ebbd42dd05d45fa655852169978beec40e Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 20 Mar 2019 11:32:53 +0100
Subject: Fix tree recursion in QAbstractItemModel::match()

Recurse down the sibling at column 0 of the index instead down the
index.

Change-Id: Ie78d8b28eab7438ca3f83ee0df177115ca82806e
Fixes: QTBUG-73864
Reviewed-by: David Faure <david.faure@kdab.com>
---
 .../tst_qsortfilterproxymodel.cpp                  | 39 ++++++++++++++++++++++
 .../tst_qsortfilterproxymodel.h                    |  1 +
 2 files changed, 40 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
index 50e87f21ac..ccce5a44e5 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
@@ -2363,6 +2363,45 @@ void tst_QSortFilterProxyModel::match()
         QCOMPARE(indexes.at(i).row(), expectedProxyItems.at(i));
 }
 
+QList<QStandardItem *> createStandardItemList(const QString &prefix, int n)
+{
+    QList<QStandardItem *> result;
+    for (int i = 0; i < n; ++i)
+        result.append(new QStandardItem(prefix + QString::number(i)));
+    return result;
+}
+
+// QTBUG-73864, recursive search in a tree model.
+
+void tst_QSortFilterProxyModel::matchTree()
+{
+    QStandardItemModel model(0, 2);
+    // Header00 Header01
+    // Header10 Header11
+    //   Item00 Item01
+    //   Item10 Item11
+    model.appendRow(createStandardItemList(QLatin1String("Header0"), 2));
+    auto headerRow = createStandardItemList(QLatin1String("Header1"), 2);
+    model.appendRow(headerRow);
+    headerRow.first()->appendRow(createStandardItemList(QLatin1String("Item0"), 2));
+    headerRow.first()->appendRow(createStandardItemList(QLatin1String("Item1"), 2));
+
+    auto item11 = model.match(model.index(1, 1), Qt::DisplayRole, QLatin1String("Item11"), 20,
+                              Qt::MatchRecursive).value(0);
+    QVERIFY(item11.isValid());
+    QCOMPARE(item11.data().toString(), QLatin1String("Item11"));
+
+    // Repeat in proxy model
+    QSortFilterProxyModel proxy;
+    proxy.setSourceModel(&model);
+    auto proxyItem11 = proxy.match(proxy.index(1, 1), Qt::DisplayRole, QLatin1String("Item11"), 20,
+                              Qt::MatchRecursive).value(0);
+    QVERIFY(proxyItem11.isValid());
+    QCOMPARE(proxyItem11.data().toString(), QLatin1String("Item11"));
+
+    QCOMPARE(proxy.mapToSource(proxyItem11).internalId(), item11.internalId());
+}
+
 void tst_QSortFilterProxyModel::insertIntoChildrenlessItem()
 {
     QStandardItemModel model;
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h
index d598a60932..8ae97165b8 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h
@@ -109,6 +109,7 @@ private slots:
     void selectionFilteredOut();
     void match_data();
     void match();
+    void matchTree();
     void insertIntoChildrenlessItem();
     void invalidateMappedChildren();
     void insertRowIntoFilteredParent();
-- 
cgit v1.2.3