From 18b7ef9506609490a3958a97d5806ce0985a5575 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Wed, 11 Jan 2012 12:10:45 +0200 Subject: 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 Reviewed-by: Joerg Bornemann Reviewed-by: Andreas Holzammer --- src/corelib/io/qfsfileengine_win.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 } -- cgit v0.12