diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2011-08-26 15:09:01 (GMT) |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2011-08-26 15:12:55 (GMT) |
| commit | 2e32fca2c0f5252864d348df929d9858486763b1 (patch) | |
| tree | c496bb195196565f83ae0c50a33d12ba7b18f249 /src/corelib | |
| parent | d4aa1777389f41da60a862a8c371d13839938d43 (diff) | |
| download | Qt-2e32fca2c0f5252864d348df929d9858486763b1.zip Qt-2e32fca2c0f5252864d348df929d9858486763b1.tar.gz Qt-2e32fca2c0f5252864d348df929d9858486763b1.tar.bz2 | |
In 4.7 QFileInfo::absolute(File)Path returned clean paths
Let's play nice and keep that "feature".
Task-number: QTBUG-19995
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qfileinfo.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index ff328da..e317d1e 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -76,7 +76,9 @@ QString QFileInfoPrivate::getFileName(QAbstractFileEngine::FileName name) const break; case QAbstractFileEngine::AbsoluteName: case QAbstractFileEngine::AbsolutePathName: { - QFileSystemEntry entry = QFileSystemEngine::absoluteName(fileEntry); + QFileSystemEntry entry = QFileSystemEntry( + QDir::cleanPath(QFileSystemEngine::absoluteName(fileEntry).filePath()), + QFileSystemEntry::FromInternalPath()); if (cache_enabled) { // be smart and store both fileNames[QAbstractFileEngine::AbsoluteName] = entry.filePath(); fileNames[QAbstractFileEngine::AbsolutePathName] = entry.path(); |