Changeset 1116

Timestamp:

Mar 4, 2013, 10:31:22 PM (12 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Fix enumerating root drives with QDirIterator (r1114 regression).

File:

• trunk/src/corelib/io/qfsfileengine_iterator_os2.cpp (modified) (1 diff)

trunk/src/corelib/io/qfsfileengine_iterator_os2.cpp ¶

@@ -271 +271 @@
 #else // !QT_OS2_USE_DOSFINDFIRST
         } else {
-            // DosFindFirst is unaware of symlinks; help it
-            path = QFileInfo(path).canonicalFilePath().append(QLatin1String("/*"));
+            // DosFindFirst is unaware of symlinks; help it with canonicalFilePath()
+            QString mask = QFileInfo(path).canonicalFilePath().append(QLatin1String("/*"));
+            mask = QDir::toNativeSeparators(QDir::cleanPath(mask));
             ULONG count = 1;
-            if (DosFindFirst(QFile::encodeName(path).constData(),
+            if (DosFindFirst(QFile::encodeName(mask).constData(),
                              &that->platform->hdir,
                              FILE_NORMAL | FILE_READONLY | FILE_HIDDEN |