From c22be731680c8766894419f9c91a659459baadeb Mon Sep 17 00:00:00 2001
From: "Jonas M. Gastal" <jgastal@profusion.mobi>
Date: Mon, 30 Jan 2012 11:09:13 -0200
Subject: 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>
---
 src/corelib/io/qdiriterator.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/corelib/io/qdiriterator.cpp')

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
-- 
cgit v1.2.3