From 1cd85c541fced0d4efc95dc8f2948be7748a839c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Wed, 22 Aug 2012 13:32:52 +0200 Subject: [PATCH] Use QString for user-visible strings dirPath is kept as the "user visible" path string and is used to construct paths during directory iteration. In QFileSystemEntry (and in Qt, more generally) these are represented with QString. While on Windows QFileSystemEntry::NativePath and QString are one and the same, dirPath does not represent a native path. So, basically, don't do that. Change-Id: I987477cb41b37018634ac43aeda004d254181dc5 Reviewed-by: Oswald Buddenhagen Reviewed-by: Shane Kearns --- src/corelib/io/qfilesystemiterator_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/io/qfilesystemiterator_p.h b/src/corelib/io/qfilesystemiterator_p.h index 5c249d6dba..71543af7ef 100644 --- a/src/corelib/io/qfilesystemiterator_p.h +++ b/src/corelib/io/qfilesystemiterator_p.h @@ -86,7 +86,7 @@ private: // Platform-specific data #if defined(Q_OS_WIN) - QFileSystemEntry::NativePath dirPath; + QString dirPath; HANDLE findFileHandle; QStringList uncShares; bool uncFallback;