diff options
author | Tasuku Suzuki <stasuku@gmail.com> | 2013-02-25 23:45:22 +0900 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-10 09:24:12 +0200 |
commit | 95aa526987a2ef536c07d2607e8fdfc21c3e9096 (patch) | |
tree | 798c9089c172b7a643a555469b80b02845cba3e3 /src/imports/folderlistmodel/fileinfothread.cpp | |
parent | a2e8e835fc187a3a804c6d4c0b46e9039c137dc6 (diff) |
fix Folderlistmodel "showDotAndDotDot" didn't show "."
Task-number: QTBUG-29858
Change-Id: Ia736776e2587601a80d0aef22bb5cfce74040d39
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/imports/folderlistmodel/fileinfothread.cpp')
-rw-r--r-- | src/imports/folderlistmodel/fileinfothread.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/imports/folderlistmodel/fileinfothread.cpp b/src/imports/folderlistmodel/fileinfothread.cpp index 64a4b02e91..0f984bedd9 100644 --- a/src/imports/folderlistmodel/fileinfothread.cpp +++ b/src/imports/folderlistmodel/fileinfothread.cpp @@ -57,7 +57,7 @@ FileInfoThread::FileInfoThread(QObject *parent) sortUpdate(false), showDirs(true), showDirsFirst(false), - showDotDot(false), + showDotAndDotDot(false), showOnlyReadable(false) { #ifndef QT_NO_FILESYSTEMWATCHER @@ -158,10 +158,10 @@ void FileInfoThread::setShowDirsFirst(bool show) condition.wakeAll(); } -void FileInfoThread::setShowDotDot(bool on) +void FileInfoThread::setShowDotAndDotDot(bool on) { QMutexLocker locker(&mutex); - showDotDot = on; + showDotAndDotDot = on; folderUpdate = true; condition.wakeAll(); } @@ -212,10 +212,12 @@ void FileInfoThread::run() void FileInfoThread::getFileInfos(const QString &path) { QDir::Filters filter; - filter = QDir::Files | QDir::NoDot | QDir::CaseSensitive; + filter = QDir::Files | QDir::CaseSensitive; if (showDirs) filter = filter | QDir::AllDirs | QDir::Drives; - if ((path == rootPath) || !showDotDot) + if (!showDotAndDotDot) + filter = filter | QDir::NoDot | QDir::NoDotDot; + else if (path == rootPath) filter = filter | QDir::NoDotDot; if (showOnlyReadable) filter = filter | QDir::Readable; |