diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2011-08-24 09:02:08 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-13 11:30:43 +0100 |
| commit | 2fab348c81130a0c81eea92cc155c278e260b25c (patch) | |
| tree | fb67f1c8018d083bc0cb6f08b033b579006009a4 /src/corelib/io | |
| parent | 621b121c07bcbc5639d3c412224496489d41fad4 (diff) | |
Build fix for WINCE to qfsfileengine_win.cpp
QFileSystemEngine::currentPath() returns QFileSystemEntry, but
this method expects QString return value.
-> Code does not compile for WinCE
Switched code to use "QFileSystemEngine::currentPath().filePath()"
correspondigly as Windows desktop does if filename does not contain
drive letter. This is ok, since WinCE does not support drive letters.
Task-number: QTBUG-22499
Change-Id: Ic4935357c40cda30efcd2e1c7d69bf2ef7b31dd0
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfsfileengine_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index e0abd9298f..d0676a0dcf 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -550,7 +550,7 @@ QString QFSFileEngine::currentPath(const QString &fileName) return ret; #else Q_UNUSED(fileName); - return QFileSystemEngine::currentPath(); + return QFileSystemEngine::currentPath().filePath(); #endif } |