diff options
| author | Jonas M. Gastal <jgastal@profusion.mobi> | 2012-01-30 11:09:13 -0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 20:01:02 +0100 |
| commit | c22be731680c8766894419f9c91a659459baadeb (patch) | |
| tree | 093f520ca4de4a3aaf3a2d58400a12ab72a90264 /src/corelib/io/qdiriterator.cpp | |
| parent | fe7265a0bbe4da9577fecd8cb9be22262523f65b (diff) | |
QDir::NoDotAndDotDot is now QDir::NoDot|QDir::NoDotDot.
Change-Id: I8ef7782258c2ec02ad2ec2a5d5cab90f53c62aa3
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/io/qdiriterator.cpp')
| -rw-r--r-- | src/corelib/io/qdiriterator.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index cd80e1adf6..c5f24071aa 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -330,8 +330,6 @@ bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInf return false; if ((filters & QDir::NoDotDot) && dotOrDotDot && fileNameSize == 2) return false; - if ((filters & QDir::NoDotAndDotDot) && dotOrDotDot) // ### Qt5 remove (NoDotAndDotDot == NoDot|NoDotDot) - return false; // name filter #ifndef QT_NO_REGEXP |