Merge remote-tracking branch 'origin/5.10.0' into 5.10

Change-Id: I6dcf85067ec226136c207ea69ca9d66736c84db5

1 files changed, 4 insertions, 4 deletions

diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index ef3281df30..7dad892606 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -2657,8 +2657,8 @@ void QSortFilterProxyModel::setFilterRole(int role)
 }
 
 /*!
-    \since 5.9
-    \property QSortFilterProxyModel::recursiveFiltering
+    \since 5.10
+    \property QSortFilterProxyModel::recursiveFilteringEnabled
     \brief whether the filter to be applied recursively on children, and for
     any matching child, its parents will be visible as well.
 
@@ -2666,13 +2666,13 @@ void QSortFilterProxyModel::setFilterRole(int role)
 
     \sa filterAcceptsRow()
 */
-bool QSortFilterProxyModel::recursiveFiltering() const
+bool QSortFilterProxyModel::isRecursiveFilteringEnabled() const
 {
     Q_D(const QSortFilterProxyModel);
     return d->filter_recursive;
 }
 
-void QSortFilterProxyModel::setRecursiveFiltering(bool recursive)
+void QSortFilterProxyModel::setRecursiveFilteringEnabled(bool recursive)
 {
     Q_D(QSortFilterProxyModel);
     if (d->filter_recursive == recursive)