Skip to content

Backport two fixes for QSortFilterProxyModel

David Faure requested to merge dfaure/qtbase:work/dfaure/fix_two_qsfpm_issues into kde/5.15

First one:

Fix get out of bounds index in QSortFilterProxyModel::filterAcceptsRow

Before calling the index function, we need to check the validity of the parameters.

Fixes: QTBUG-91878
Change-Id: I9ec7265fff3f81b8a288c4ba8fae606a2ec808a6
Reviewed-by: David Faure <david.faure@kdab.com>
(cherry picked from commit b8802071ed00689373da5817fc4824a30b5fcf86)
(cherry picked from commit 0a5326a6c292df9cda313e0dcbe75f69f2f7072d)

Second one:

commit f6b2c357 Author: Joni Poikelin joni.poikelin@qt.io Date: Mon Mar 15 12:54:45 2021 +0200

Fix removing columns when QSortFilterProxyModel has not been sorted yet

Fixes: QTBUG-91788
Change-Id: Iddcafd3171f0f3703b94893a32b4ccaaeea9e713
Reviewed-by: David Faure <david.faure@kdab.com>
(cherry picked from commit e287582cba74ddcfc67f83647e72c0b23bd99c36)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 6bd89d122e488d83c3e9310cf102ef238de8ac00)

Merge request reports