Build fix for WINCE to qfsfileengine_win.cpp
authorJanne Anttila <janne.anttila@digia.com>
Wed, 24 Aug 2011 06:02:08 +0000 (09:02 +0300)
committerQt by Nokia <qt-info@nokia.com>
Fri, 13 Jan 2012 10:30:43 +0000 (11:30 +0100)
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>
src/corelib/io/qfsfileengine_win.cpp

index e0abd92..d0676a0 100644 (file)
@@ -550,7 +550,7 @@ QString QFSFileEngine::currentPath(const QString &fileName)
     return ret;
 #else
     Q_UNUSED(fileName);
-    return QFileSystemEngine::currentPath();
+    return QFileSystemEngine::currentPath().filePath();
 #endif
 }