summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-03-24 11:41:03 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-03-24 13:47:08 (GMT)
commit680bed3dfd50ee888874b5d322899243e0143ff6 (patch)
tree38404f38f60d2df1f649cadb4bfb487c8169b0a0 /src
parent0df19648d2777c021e7bfe3031e097016a159e8e (diff)
downloadQt-680bed3dfd50ee888874b5d322899243e0143ff6.zip
Qt-680bed3dfd50ee888874b5d322899243e0143ff6.tar.gz
Qt-680bed3dfd50ee888874b5d322899243e0143ff6.tar.bz2
Make sure QSortFilterProxyModel::sort always sort when DynamicSort is not used
Task-number: 248868 (part 1) Reviewed-by: Thierry
Diffstat (limited to 'src')
-rw-r--r--src/gui/itemviews/qsortfilterproxymodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp
index b3993c7..b6fb598 100644
--- a/src/gui/itemviews/qsortfilterproxymodel.cpp
+++ b/src/gui/itemviews/qsortfilterproxymodel.cpp
@@ -1893,7 +1893,7 @@ QSize QSortFilterProxyModel::span(const QModelIndex &index) const
void QSortFilterProxyModel::sort(int column, Qt::SortOrder order)
{
Q_D(QSortFilterProxyModel);
- if (d->proxy_sort_column == column && d->sort_order == order)
+ if (d->dynamic_sortfilter && d->proxy_sort_column == column && d->sort_order == order)
return;
d->sort_order = order;
d->proxy_sort_column = column;