1 files changed, 5 insertions, 7 deletions
diff --git a/src/tools/windeployqt/qtmoduleinfo.cpp b/src/tools/windeployqt/qtmoduleinfo.cpp
index 57aa8e54a0..b928a64478 100644
--- a/src/tools/windeployqt/qtmoduleinfo.cpp
+++ b/src/tools/windeployqt/qtmoduleinfo.cpp
@@ -4,7 +4,7 @@
 #include "qtmoduleinfo.h"
 #include "utils.h"
 
-#include <QDirIterator>
+#include <QDirListing>
 #include <QJsonDocument>
 #include <QJsonArray>
 #include <QDebug>
@@ -134,14 +134,12 @@ bool QtModuleInfoStore::populate(const QString &modulesDir, const QString &trans
     }
 
     // Read modules, and assign a bit as ID.
-    QDirIterator dit(modulesDir, { QLatin1String("*.json") }, QDir::Files);
-    while (dit.hasNext()) {
-        QString filePath = dit.next();
-        QtModule module = moduleFromJsonFile(filePath, errorString);
+    for (const auto &dirEntry : QDirListing(modulesDir, {u"*.json"_s}, QDir::Files)) {
+        QtModule module = moduleFromJsonFile(dirEntry.filePath(), errorString);
         if (!errorString->isEmpty())
             return false;
-        if (module.internal)
-            continue;
+        if (module.internal && module.name.endsWith(QStringLiteral("Private")))
+            module.name.chop(7);
         module.id = modules.size();
         if (module.id == QtModule::InvalidId) {
             *errorString = "Internal Error: too many modules for ModuleBitset to hold."_L1;