summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qdir.cpp
diff options
context:
space:
mode:
authorJoão Abecasis <joao.abecasis@nokia.com>2011-08-11 13:49:37 (GMT)
committerJoão Abecasis <joao.abecasis@nokia.com>2011-08-26 12:06:42 (GMT)
commitdcee6e1371d899eb79717b8e3f3eec08b765db82 (patch)
treef34d4d7d6a05fb1939fbcb5d707496fdea095b38 /src/corelib/io/qdir.cpp
parent7b693627ee2a17718cb6d8bee5e3deb5a97b307f (diff)
downloadQt-dcee6e1371d899eb79717b8e3f3eec08b765db82.zip
Qt-dcee6e1371d899eb79717b8e3f3eec08b765db82.tar.gz
Qt-dcee6e1371d899eb79717b8e3f3eec08b765db82.tar.bz2
Fix QDir::operator==(const QDir &) const
We can't rely on absolute paths when comparing directories for equality as these don't take into account symbolic links and may also bypass ../ and ./ simplification. Instead, canonical paths must be computed and can then be compared according to the case sensitivity rules for the platform or file engine, as is done in QFileInfo. Task-number: QTBUG-20495 Reviewed-by: Prasanth Ullattil
Diffstat (limited to 'src/corelib/io/qdir.cpp')
-rw-r--r--src/corelib/io/qdir.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index f9196e0..6e25d91 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -1633,9 +1633,9 @@ bool QDir::operator==(const QDir &dir) const
if (d->filters == other->filters
&& d->sort == other->sort
&& d->nameFilters == other->nameFilters) {
- d->resolveAbsoluteEntry();
- other->resolveAbsoluteEntry();
- return d->absoluteDirEntry.filePath().compare(other->absoluteDirEntry.filePath(), sensitive) == 0;
+
+ // Fallback to expensive canonical path computation
+ return canonicalPath().compare(dir.canonicalPath(), sensitive) == 0;
}
return false;
}