Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into tqtc/lts-5.15-opensourcev5.15.10-lts-lgpl

Change-Id: Ic1bb4240ca70a8a361fa0267476707446579221d

1 files changed, 12 insertions, 4 deletions

diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index dc6379d9fb..3d7fe43cd3 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -2601,9 +2601,12 @@ void QSortFilterProxyModel::sort(int column, Qt::SortOrder order)
 
 /*!
     \since 4.5
-    \brief the column currently used for sorting
+    \return the column currently used for sorting
 
-    This returns the most recently used sort column.
+    This returns the most recently used sort column. The default value is -1,
+    which means that this proxy model does not sort.
+
+    \sa sort()
 */
 int QSortFilterProxyModel::sortColumn() const
 {
@@ -2613,9 +2616,12 @@ int QSortFilterProxyModel::sortColumn() const
 
 /*!
     \since 4.5
-    \brief the order currently used for sorting
+    \return the order currently used for sorting
+
+    This returns the most recently used sort order. The default value is
+    Qt::AscendingOrder.
 
-    This returns the most recently used sort order.
+    \sa sort()
 */
 Qt::SortOrder QSortFilterProxyModel::sortOrder() const
 {
@@ -2890,6 +2896,8 @@ void QSortFilterProxyModel::setFilterFixedString(const QString &pattern)
     QComboBox.
 
     The default value is true.
+
+    \sa sortColumn()
 */
 bool QSortFilterProxyModel::dynamicSortFilter() const
 {