Changeset 1146

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

corelib: Fix another regression of r1114 preventing Qt Creator from starting.

File:

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

trunk/src/corelib/io/qfsfileengine_iterator_os2.cpp

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