Don't second-guess the "engine"; call cleanPath on absolutePaths

This ensures there is a single definition of what constitutes an
absolute path in Qt.

Task-number: QTBUG-19995
Reviewed-by: Prasanth Ullattil

1 files changed, 2 insertions, 8 deletions

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