5 files changed, 25 insertions, 20 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index 7cbb44dde4..9bbeed36ff 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -512,7 +512,10 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool)
 
     QFile filterFile;
     filterFile.setFileName(Option::output.fileName().append(".filters"));
-    filterFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
+    if (!filterFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
+        warn_msg(WarnLogic, "Generator: cannot open output filter file");
+        return;
+    }
     QTextStream ts(&filterFile);
     XmlOutput xmlFilter(ts, XmlOutput::NoConversion);
 
@@ -751,7 +754,10 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
     // The file filters are added in a separate file for MSBUILD.
     QFile filterFile;
     filterFile.setFileName(Option::output.fileName().append(".filters"));
-    filterFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
+    if (!filterFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
+        warn_msg(WarnLogic, "Cannot open output filter file");
+        return;
+    }
     QTextStream ts(&filterFile);
     XmlOutput xmlFilter(ts, XmlOutput::NoConversion);
 
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 1e21afd1c2..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>
@@ -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();
+        constexpr auto filters = QDir::Files | QDir::NoDotAndDotDot;
         for (const QString &sourceDir : std::as_const(fixifiedSourceDirs)) {
-            QDirIterator dit(sourceDir, sourceFilesFilter, QDir::Files | QDir::NoDotAndDotDot);
-            while (dit.hasNext()) {
-                const QFileInfo fi = dit.nextFileInfo();
-                QString &duplicate = fileNames[fi.completeBaseName()];
+            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;
                 }
             }
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 5878686828..6517e5c451 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -862,7 +862,7 @@ bool VCCLCompilerTool::parseOption(const char* option)
                 }
                 break;
             }
-            // Fallthrough
+            [[fallthrough]];
         default:
             found = false; break;
         }
@@ -1478,7 +1478,8 @@ bool VCLinkerTool::parseOption(const char* option)
             EnableUAC = _True;
         break;
     case 0x3389797: // /DEBUG[:{FASTLINK|FULL|NONE}]
-        if (config->CompilerVersion >= NET2015) {
+        DebugInfoOption = linkerDebugOptionEnabled;
+        if (config->CompilerVersion >= NET2015 && *(option + 6) == ':') {
             const char *str = option + 7;
             if (qstricmp(str, "fastlink") == 0)
                 DebugInfoOption = linkerDebugOptionFastLink;
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index f0869d510f..190d6c727f 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -258,6 +258,7 @@ enum inlineExpansionOption {
 };
 enum linkerDebugOption {
     linkerDebugOptionNone,
+    linkerDebugOptionEnabled,     // represents /DEBUG without further options
     linkerDebugOptionFastLink,
     linkerDebugOptionFull
 };
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index ac50253a44..2192535867 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -8,7 +8,7 @@
 #include <ioutils.h>
 
 #include <qdir.h>
-#include <qdiriterator.h>
+#include <qdirlisting.h>
 #include <qcryptographichash.h>
 #include <qhash.h>
 #include <quuid.h>
@@ -1293,18 +1293,16 @@ void VcprojGenerator::initDeploymentTool()
             }
 
             int pathSize = searchPath.size();
-            QDirIterator iterator(searchPath, QStringList() << nameFilter
-                                  , QDir::Files | QDir::NoDotAndDotDot | QDir::NoSymLinks
-                                  , QDirIterator::Subdirectories);
+            constexpr auto filters = QDir::Files | QDir::NoDotAndDotDot | QDir::NoSymLinks;
+            using F = QDirListing::IteratorFlag;
+            QDirListing dirList(searchPath, QStringList{nameFilter}, filters, F::Recursive);
             // foreach dirIterator-entry in d
-            while(iterator.hasNext()) {
-                iterator.next();
-
-                QString absoluteItemPath = Option::fixPathToTargetOS(QFileInfo(iterator.filePath()).absolutePath());
+            for (const auto &dirEntry : dirList) {
+                const QString absoluteItemPath = Option::fixPathToTargetOS(dirEntry.absolutePath());
                 // Identify if it is just another subdir
                 int diffSize = absoluteItemPath.size() - pathSize;
                 // write out rules
-                conf.deployment.AdditionalFiles += iterator.fileName()
+                conf.deployment.AdditionalFiles += dirEntry.fileName()
                         + "|" + absoluteItemPath
                         + "|" + itemDevicePath + (diffSize ? (absoluteItemPath.right(diffSize)) : QLatin1String(""))
                         + "|0;";