]> cloud.milkyroute.net Git - dolphin.git/commit
Fix sorting-issue when "Sort folders first" is disabled
authorPeter Penz <peter.penz19@gmail.com>
Tue, 20 Mar 2012 22:28:39 +0000 (23:28 +0100)
committerPeter Penz <peter.penz19@gmail.com>
Tue, 20 Mar 2012 22:35:43 +0000 (23:35 +0100)
commitd3a2f1ba82de87dbc0f762263e4509d2d73f7fd0
treee4148bb58441167701844d5ac473d7a1baac2e18
parent4815fbd00bfcaaa8daaae447c1f61d1acfd68de0
Fix sorting-issue when "Sort folders first" is disabled

The comparison of expanded trees may not assume that directories
are always sorted first and must respect the "Sort folders first"
setting.

The sorting-unittest has been extended by a sub-tree and the usecase
of bug 296437. The already deactivated test for
KFileItemModel::expandedParentsCountCompare() has been completely removed
as it has been replaced by testSorting().

BUG: 296437
FIXED-IN: 4.8.2
src/kitemviews/kfileitemmodel.cpp
src/tests/kfileitemmodeltest.cpp