diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-09-22 14:10:09 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-09-22 14:32:51 (GMT) |
| commit | 1931c3e4cb502ba1d7461129bcc6f3c9ee600f9c (patch) | |
| tree | d5245ea95024f4f87482863354915e7dcb4f7ba8 | |
| parent | 24a928dd31ea54063b802cc2d249afe852daeebe (diff) | |
| download | Qt-1931c3e4cb502ba1d7461129bcc6f3c9ee600f9c.zip Qt-1931c3e4cb502ba1d7461129bcc6f3c9ee600f9c.tar.gz Qt-1931c3e4cb502ba1d7461129bcc6f3c9ee600f9c.tar.bz2 | |
fix failing qdir autotest
File engine was adding '/' to the result of QDir::cleanPath(),
which is correct for everything except root directories, where it caused
a path like "c://"
Reviewed-by: axis
| -rw-r--r-- | src/corelib/io/qfsfileengine_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp index e54bad6..4ec5772 100644 --- a/src/corelib/io/qfsfileengine_unix.cpp +++ b/src/corelib/io/qfsfileengine_unix.cpp @@ -899,7 +899,7 @@ QString QFSFileEngine::fileName(FileName file) const // Clean up the path bool isDir = ret.endsWith(slashChar); ret = QDir::cleanPath(ret); - if (isDir) + if (isDir && !ret.endsWith(slashChar)) ret += slashChar; if (file == AbsolutePathName) { |