diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2011-09-12 12:00:01 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-30 17:06:51 (GMT) |
| commit | 2456e800a2c1c730d9c8427fe04b7c2e0c5ac98b (patch) | |
| tree | 6c054976dc594ddca34f113a918751ea9ff8a175 | |
| parent | da69d8fe4e298c290bc68e3d550c6ccc4e5d230d (diff) | |
| download | Qt-2456e800a2c1c730d9c8427fe04b7c2e0c5ac98b.zip Qt-2456e800a2c1c730d9c8427fe04b7c2e0c5ac98b.tar.gz Qt-2456e800a2c1c730d9c8427fe04b7c2e0c5ac98b.tar.bz2 | |
Fixed fileiterator issue for WEC7.
WEC7 does not support FIND_FIRST_EX_LARGE_FETCH with FindFirstFileEx,
but windowsVersion for WEC7 is still resolved as WV_WINDOWS7.
If the FIND_FIRST_EX_LARGE_FETCH flag is passed to FindFirstFileEx
in WEC7, the method does never find any files from given directory.
Changed FIND_FIRST_EX_LARGE_FETCH flag to apply only when Q_OS_WINCE
is not defined.
Task-number: QTBUG-22503
Change-Id: Ic38cf745cda7ee7b23da67dc390ac0e6d04158cd
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
(cherry picked from commit 55a5faadb5961c4c6a81de80c5cb3687da29d4de)
| -rw-r--r-- | src/corelib/io/qfilesystemiterator_win.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/io/qfilesystemiterator_win.cpp b/src/corelib/io/qfilesystemiterator_win.cpp index 1f5cf35..3e2c9f7 100644 --- a/src/corelib/io/qfilesystemiterator_win.cpp +++ b/src/corelib/io/qfilesystemiterator_win.cpp @@ -94,10 +94,12 @@ bool QFileSystemIterator::advance(QFileSystemEntry &fileEntry, QFileSystemMetaDa haveData = true; int infoLevel = 0 ; // FindExInfoStandard; DWORD dwAdditionalFlags = 0; +#ifndef Q_OS_WINCE if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS7) { dwAdditionalFlags = 2; // FIND_FIRST_EX_LARGE_FETCH infoLevel = 1 ; // FindExInfoBasic; } +#endif int searchOps = 0; // FindExSearchNameMatch if (onlyDirs) searchOps = 1 ; // FindExSearchLimitToDirectories |