Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I71cc71881fb638e207d83a8733bad8f267701c0f

4 files changed, 52 insertions, 4 deletions

diff --git a/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
index 262c6dd9c8..c76052a38b 100644
--- a/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
@@ -32,10 +32,13 @@
 #include <QStandardItemModel>
 #include <QStringListModel>
 #include <QTest>
+#include <QLoggingCategory>
 
 #include "dynamictreemodel.h"
 #include "qidentityproxymodel.h"
 
+Q_LOGGING_CATEGORY(lcItemModels, "qt.corelib.tests.itemmodels")
+
 class DataChangedModel : public QAbstractListModel
 {
 public:
@@ -390,7 +393,7 @@ void dump(QAbstractItemModel* model, QString const& indent = " - ", QModelIndex
     for (auto row = 0; row < model->rowCount(parent); ++row)
     {
         auto idx = model->index(row, 0, parent);
-        qDebug() << (indent + idx.data().toString());
+        qCDebug(lcItemModels) << (indent + idx.data().toString());
         dump(model, indent + "- ", idx);
     }
 }
diff --git a/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp b/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
index da13b9f33f..b9deb7b6a9 100644
--- a/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
@@ -125,6 +125,7 @@ private:
 tst_QItemModel::tst_QItemModel()
 {
     qRegisterMetaType<QAbstractItemModel::LayoutChangeHint>();
+    qRegisterMetaType<QList<QPersistentModelIndex>>();
 }
 
 void tst_QItemModel::init()
@@ -181,7 +182,7 @@ void tst_QItemModel::nonDestructiveBasicTest()
     currentModel->hasChildren(QModelIndex());
     currentModel->hasIndex(0, 0);
     currentModel->headerData(0, Qt::Horizontal);
-    currentModel->index(0,0), QModelIndex();
+    currentModel->index(0,0);
     currentModel->itemData(QModelIndex());
     QVariant cache;
     currentModel->match(QModelIndex(), -1, cache);
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
index 82cd26971b..ccce5a44e5 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
@@ -38,6 +38,8 @@
 
 #include <qdebug.h>
 
+Q_LOGGING_CATEGORY(lcItemModels, "qt.corelib.tests.itemmodels")
+
 // Testing get/set functions
 void tst_QSortFilterProxyModel::getSetCheck()
 {
@@ -2361,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;
@@ -4277,7 +4318,7 @@ public:
     QModelIndex index(int, int, const QModelIndex& parent = QModelIndex()) const override
     {
         // QTBUG-44962: Would we always expect the parent to belong to the model
-        qDebug() << parent.model() << this;
+        qCDebug(lcItemModels) << parent.model() << this;
         Q_ASSERT(!parent.isValid() || parent.model() == this);
 
         quintptr parentId = (parent.isValid()) ? parent.internalId() : 0;
@@ -4363,7 +4404,7 @@ void tst_QSortFilterProxyModel::sourceLayoutChangeLeavesValidPersistentIndexes()
     // The use of qDebug here makes sufficient use of the heap to
     // cause corruption at runtime with normal use on linux (before
     // the fix). valgrind confirms the fix.
-    qDebug() << persistentIndex.parent();
+    qCDebug(lcItemModels) << persistentIndex.parent();
     QVERIFY(persistentIndex.parent().isValid());
 }
 
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h
index 82d4b7344e..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();
@@ -186,4 +187,6 @@ private:
 
 Q_DECLARE_METATYPE(QAbstractItemModel::LayoutChangeHint)
 
+Q_DECLARE_LOGGING_CATEGORY(lcItemModels)
+
 #endif // TST_QSORTFILTERPROXYMODEL_H