1 files changed, 11 insertions, 12 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 7e0eb4ed41..b5df617927 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -6,7 +6,7 @@
 
 #include <qregularexpression.h>
 #include <qdir.h>
-#include <qdiriterator.h>
+#include <qdirlisting.h>
 #include <qset.h>
 
 #include <time.h>
@@ -264,9 +264,9 @@ QStringList NmakeMakefileGenerator::sourceFilesForImplicitRulesFilter()
 {
     QStringList filter;
     const QChar wildcard = QLatin1Char('*');
-    for (const QString &ext : qAsConst(Option::c_ext))
+    for (const QString &ext : std::as_const(Option::c_ext))
         filter << wildcard + ext;
-    for (const QString &ext : qAsConst(Option::cpp_ext))
+    for (const QString &ext : std::as_const(Option::cpp_ext))
         filter << wildcard + ext;
     return filter;
 }
@@ -290,7 +290,7 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &t)
         for (int y = 0; directories[y]; y++) {
             QString dirTemp = project->first(directories[y]).toQString();
             if (dirTemp.endsWith("\\"))
-                dirTemp.truncate(dirTemp.length()-1);
+                dirTemp.truncate(dirTemp.size()-1);
             if(!dirTemp.isEmpty())
                 source_directories.insert(dirTemp);
         }
@@ -314,16 +314,15 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &t)
         const QStringList sourceFilesFilter = sourceFilesForImplicitRulesFilter();
         QStringList fixifiedSourceDirs = fileFixify(QList<QString>(source_directories.constBegin(), source_directories.constEnd()), FileFixifyAbsolute);
         fixifiedSourceDirs.removeDuplicates();
-        for (const QString &sourceDir : qAsConst(fixifiedSourceDirs)) {
-            QDirIterator dit(sourceDir, sourceFilesFilter, QDir::Files | QDir::NoDotAndDotDot);
-            while (dit.hasNext()) {
-                const QFileInfo fi = dit.nextFileInfo();
-                QString &duplicate = fileNames[fi.completeBaseName()];
+        constexpr auto filters = QDir::Files | QDir::NoDotAndDotDot;
+        for (const QString &sourceDir : std::as_const(fixifiedSourceDirs)) {
+            for (const auto &dirEntry : QDirListing(sourceDir, sourceFilesFilter, filters)) {
+                QString &duplicate = fileNames[dirEntry.completeBaseName()];
                 if (duplicate.isNull()) {
-                    duplicate = fi.filePath();
+                    duplicate = dirEntry.filePath();
                 } else {
                     warn_msg(WarnLogic, "%s conflicts with %s", qPrintable(duplicate),
-                             qPrintable(fi.filePath()));
+                             qPrintable(dirEntry.filePath()));
                     duplicatesFound = true;
                 }
             }
@@ -339,7 +338,7 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &t)
         project->variables().remove("QMAKE_RUN_CXX");
         project->variables().remove("QMAKE_RUN_CC");
 
-        for (const QString &sourceDir : qAsConst(source_directories)) {
+        for (const QString &sourceDir : std::as_const(source_directories)) {
             if (sourceDir.isEmpty())
                 continue;
             QString objDir = var("OBJECTS_DIR");