Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277

2 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp b/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
index dbc7173028..354190e754 100644
--- a/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
+++ b/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
@@ -153,7 +153,7 @@ QAbstractItemModel *ModelsToTest::createModel(const QString &modelType)
         QStandardItemModel *standardItemModel = new QStandardItemModel;
         model->setSourceModel(standardItemModel);
         populateTestArea(model);
-        model->setFilterRegExp(QRegExp("(^$|I.*)"));
+        model->setFilterRegularExpression(QRegularExpression("(^$|I.*)"));
         return model;
     }
 
diff --git a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
index 1cc671a917..f78f5bc138 100644
--- a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
@@ -2264,7 +2264,7 @@ void tst_QItemSelectionModel::layoutChangedWithAllSelected1()
 
     QCOMPARE(model.rowCount(), 3);
     QCOMPARE(proxy.rowCount(), 3);
-    proxy.setFilterRegExp( QRegExp("f"));
+    proxy.setFilterRegularExpression(QRegularExpression("f"));
     QCOMPARE(proxy.rowCount(), 2);
 
     QList<QPersistentModelIndex> indexList;
@@ -2276,7 +2276,7 @@ void tst_QItemSelectionModel::layoutChangedWithAllSelected1()
     foreach(QPersistentModelIndex index, indexList)
         QVERIFY(selection.isSelected(index));
 
-    proxy.setFilterRegExp(QRegExp());
+    proxy.setFilterRegularExpression(QRegularExpression());
     QCOMPARE(proxy.rowCount(), 3);
 
     //let's check the selection hasn't changed