diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2011-08-26 15:58:27 (GMT) |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2011-08-26 15:59:06 (GMT) |
| commit | 7b45a4cbf7593c8d7a837d826d9827fee243c46c (patch) | |
| tree | 98c3ec67780efb2ef18c09e22743c5dff166ebd0 /src | |
| parent | c0278760008efa18a068c6b5b2634b6cdb473dbf (diff) | |
| download | Qt-7b45a4cbf7593c8d7a837d826d9827fee243c46c.zip Qt-7b45a4cbf7593c8d7a837d826d9827fee243c46c.tar.gz Qt-7b45a4cbf7593c8d7a837d826d9827fee243c46c.tar.bz2 | |
Revert "Don't second-guess the "engine"; call cleanPath on absolutePaths"
This reverts commit 07afddbf4bc029f776810381c7317fffa100eb60.
This breaks QDir autotests on windows.
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qdir.cpp | 10 |
1 files 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()); } |