From 7b45a4cbf7593c8d7a837d826d9827fee243c46c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao.abecasis@nokia.com>
Date: Fri, 26 Aug 2011 17:58:27 +0200
Subject: Revert "Don't second-guess the "engine"; call cleanPath on
 absolutePaths"

This reverts commit 07afddbf4bc029f776810381c7317fffa100eb60.

This breaks QDir autotests on windows.
---
 src/corelib/io/qdir.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index cbe635f..c0c62e1 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -197,10 +197,16 @@ inline void QDirPrivate::resolveAbsoluteEntry() const
         return;
 
     QString absoluteName;
-    if (fileEngine.isNull())
+    if (fileEngine.isNull()) {
+        if (!dirEntry.isRelative()) {
+            absoluteDirEntry = dirEntry;
+            return;
+        }
+
         absoluteName = QFileSystemEngine::absoluteName(dirEntry).filePath();
-    else
+    } else {
         absoluteName = fileEngine->fileName(QAbstractFileEngine::AbsoluteName);
+    }
 
     absoluteDirEntry = QFileSystemEntry(QDir::cleanPath(absoluteName), QFileSystemEntry::FromInternalPath());
 }
-- 
cgit v0.12