summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qdir.h
diff options
context:
space:
mode:
authorJonas M. Gastal <jgastal@profusion.mobi>2012-01-30 11:09:13 -0200
committerQt by Nokia <qt-info@nokia.com>2012-01-31 20:01:02 +0100
commitc22be731680c8766894419f9c91a659459baadeb (patch)
tree093f520ca4de4a3aaf3a2d58400a12ab72a90264 /src/corelib/io/qdir.h
parentfe7265a0bbe4da9577fecd8cb9be22262523f65b (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/qdir.h')
-rw-r--r--src/corelib/io/qdir.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h
index bc7837a7c1..5551ecd2fb 100644
--- a/src/corelib/io/qdir.h
+++ b/src/corelib/io/qdir.h
@@ -77,9 +77,9 @@ public:
AllDirs = 0x400,
CaseSensitive = 0x800,
- NoDotAndDotDot = 0x1000, // ### Qt5 NoDotAndDotDot = NoDot|NoDotDot
NoDot = 0x2000,
NoDotDot = 0x4000,
+ NoDotAndDotDot = NoDot | NoDotDot,
NoFilter = -1
};