diff options
| author | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2010-08-30 15:41:37 (GMT) |
|---|---|---|
| committer | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2010-08-30 15:41:37 (GMT) |
| commit | 1bdc1dfda903426e7a0bd844c48e67ff9e6b6a94 (patch) | |
| tree | 1ad28455a5166790e477bb1fb4737b872ebeddae /src | |
| parent | 3fed8517dc34b77707a42eb1f43a4e7199f105c6 (diff) | |
| download | Qt-1bdc1dfda903426e7a0bd844c48e67ff9e6b6a94.zip Qt-1bdc1dfda903426e7a0bd844c48e67ff9e6b6a94.tar.gz Qt-1bdc1dfda903426e7a0bd844c48e67ff9e6b6a94.tar.bz2 | |
Fix the tst_QFileInfo::absolutePath() autotests on Windows
Reviewed-by: Joao
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qfsfileengine_win.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index 6f81652..9f33af5 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -1585,9 +1585,11 @@ QString QFSFileEngine::fileName(FileName file) const d->fileEntry.filePath().endsWith(QLatin1String("/..")) || d->fileEntry.filePath().endsWith(QLatin1String("/."))) { ret = QDir::fromNativeSeparators(nativeAbsoluteFilePath(d->fileEntry.filePath())); - } + } else #endif - ret = d->fileEntry.filePath(); + { + ret = d->fileEntry.filePath(); + } } else { ret = QDir::cleanPath(QDir::currentPath() + QLatin1Char('/') + d->fileEntry.filePath()); } |