diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2010-12-06 12:46:35 (GMT) |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2010-12-06 12:46:35 (GMT) |
| commit | fb43ea28e2712073de06644d78ed5a97a40f016b (patch) | |
| tree | 1cb2f827a0bc0658cc3396a8a5bf2b244e710a31 | |
| parent | 9371ba70ac747484b1300d96c2a80dcdbc872fe2 (diff) | |
| download | Qt-fb43ea28e2712073de06644d78ed5a97a40f016b.zip Qt-fb43ea28e2712073de06644d78ed5a97a40f016b.tar.gz Qt-fb43ea28e2712073de06644d78ed5a97a40f016b.tar.bz2 | |
Fix QDir::relativeFilePath
We used to call cleanPath on the result of absolutePath, before
returning it to the user, but stopped doing that. relativeFilePath
actually depended on that and broke.
Fixed now.
Reviewed-by: Prasanth Ullattil
| -rw-r--r-- | src/corelib/io/qdir.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index e1fed0d..2f97c3a 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -711,7 +711,7 @@ QString QDir::absoluteFilePath(const QString &fileName) const */ QString QDir::relativeFilePath(const QString &fileName) const { - QString dir = absolutePath(); + QString dir = cleanPath(absolutePath()); QString file = cleanPath(fileName); if (isRelativePath(file) || isRelativePath(dir)) |