diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2011-08-26 15:33:47 (GMT) |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2011-08-26 15:36:18 (GMT) |
| commit | c0278760008efa18a068c6b5b2634b6cdb473dbf (patch) | |
| tree | 0c5d61140417abeecd06f08f703d3fd2452d5272 /src/corelib | |
| parent | 2e32fca2c0f5252864d348df929d9858486763b1 (diff) | |
| download | Qt-c0278760008efa18a068c6b5b2634b6cdb473dbf.zip Qt-c0278760008efa18a068c6b5b2634b6cdb473dbf.tar.gz Qt-c0278760008efa18a068c6b5b2634b6cdb473dbf.tar.bz2 | |
Revert "In 4.7 QFileInfo::absolute(File)Path returned clean paths"
This reverts commit 2e32fca2c0f5252864d348df929d9858486763b1.
The fix there is incorrect as it breaks QFileInfo autotests.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qfileinfo.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index e317d1e..ff328da 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -76,9 +76,7 @@ QString QFileInfoPrivate::getFileName(QAbstractFileEngine::FileName name) const break; case QAbstractFileEngine::AbsoluteName: case QAbstractFileEngine::AbsolutePathName: { - QFileSystemEntry entry = QFileSystemEntry( - QDir::cleanPath(QFileSystemEngine::absoluteName(fileEntry).filePath()), - QFileSystemEntry::FromInternalPath()); + QFileSystemEntry entry = QFileSystemEngine::absoluteName(fileEntry); if (cache_enabled) { // be smart and store both fileNames[QAbstractFileEngine::AbsoluteName] = entry.filePath(); fileNames[QAbstractFileEngine::AbsolutePathName] = entry.path(); |