diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2012-01-11 10:10:45 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-12 22:01:34 (GMT) |
| commit | 18b7ef9506609490a3958a97d5806ce0985a5575 (patch) | |
| tree | 5cd479bfee175d68cee4ab96247d7db49f79d014 /src/corelib/io | |
| parent | f8f8af983f8ed95839926ab5e1def7171250f69f (diff) | |
| download | Qt-18b7ef9506609490a3958a97d5806ce0985a5575.zip Qt-18b7ef9506609490a3958a97d5806ce0985a5575.tar.gz Qt-18b7ef9506609490a3958a97d5806ce0985a5575.tar.bz2 | |
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: I211b56a5511e6c3e1b1c4009c8ee2a9c6d2f1746
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
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 bc8c73c..5c21cb3 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 } |