From 1931c3e4cb502ba1d7461129bcc6f3c9ee600f9c Mon Sep 17 00:00:00 2001
From: Shane Kearns <shane.kearns@sosco.com>
Date: Tue, 22 Sep 2009 16:10:09 +0200
Subject: 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
---
 src/corelib/io/qfsfileengine_unix.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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) {
-- 
cgit v0.12