Fix QDir::entryList regression

The changes in aa235c3cf623f832c01df9a4065375ca610d4d06 introduced a
slight change in behavior where read-only files would be checked for
write-access with _waccess.

The real fix, however, is to follow what is done in doStat and
de-reference .lnk links when checking access rights.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp
index 8fc73def56..8d344867d8 100644
--- a/src/corelib/io/qfsfileengine_win.cpp
+++ b/src/corelib/io/qfsfileengine_win.cpp
@@ -1473,7 +1473,7 @@ QAbstractFileEngine::FileFlags QFSFileEnginePrivate::getPermissions(QAbstractFil
         }
     } else
 #endif
-           {
+    {
         //### what to do with permissions if we don't use NTFS
         // for now just add all permissions and what about exe missions ??
         // also qt_ntfs_permission_lookup is now not set by default ... should it ?
@@ -1496,11 +1496,11 @@ QAbstractFileEngine::FileFlags QFSFileEnginePrivate::getPermissions(QAbstractFil
 
         // calculate user permissions
         if (type & QAbstractFileEngine::ReadUserPerm) {
-            if (::_waccess((wchar_t*)longFileName(filePath).utf16(), R_OK) == 0)
+            if (::_waccess((wchar_t*)longFileName(fname).utf16(), R_OK) == 0)
                 ret |= QAbstractFileEngine::ReadUserPerm;
         }
         if (type & QAbstractFileEngine::WriteUserPerm) {
-            if (::_waccess((wchar_t*)longFileName(filePath).utf16(), W_OK) == 0)
+            if (::_waccess((wchar_t*)longFileName(fname).utf16(), W_OK) == 0)
                 ret |= QAbstractFileEngine::WriteUserPerm;
         }
     }