Ensure that showDirs is respected in FolderListModel
authorChris Adams <christopher.adams@nokia.com>
Mon, 23 May 2011 05:38:53 +0000 (15:38 +1000)
committerChris Adams <christopher.adams@nokia.com>
Mon, 23 May 2011 07:07:57 +0000 (17:07 +1000)
commitcca7611e260c8ba86da3b01a83e70447c1c362bc
tree5871e736a8096c744c3279117befdd83e8f56daf
parent036cdbf1e128ecb4c5563087591958df93a52459
Ensure that showDirs is respected in FolderListModel

Calling index() on a QDirModel can modify the filters applied.
This patch to FolderListModel ensures that filtering is reset if
required, so that programmatically selecting a subfolder in a
folder does not cause that subfolder to become visible if showDirs
is set to false.

Task-number: QTBUG-17837
Reviewed-by: Martin Jones
Change-Id: I449321d5170ecedf2a0cb36483d50020305a26dd
src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
tests/auto/declarative/qdeclarativefolderlistmodel/data/resetFiltering.qml [new file with mode: 0644]
tests/auto/declarative/qdeclarativefolderlistmodel/data/resetfiltering/innerdir/test2.txt [new file with mode: 0644]
tests/auto/declarative/qdeclarativefolderlistmodel/data/resetfiltering/test.txt [new file with mode: 0644]
tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp