4 files changed, 13 insertions, 9 deletions
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index f451596079..54fd1ba0f0 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -15,11 +15,12 @@
 #include <QLoggingCategory>
 
 #include <private/qqmlirbuilder_p.h>
-#include <private/qqmljsparser_p.h>
+#include <private/qqmljscompiler_p.h>
 #include <private/qqmljslexer_p.h>
-#include <private/qqmljsresourcefilemapper_p.h>
 #include <private/qqmljsloadergenerator_p.h>
-#include <private/qqmljscompiler_p.h>
+#include <private/qqmljsparser_p.h>
+#include <private/qqmljsresourcefilemapper_p.h>
+#include <private/qqmljsutils_p.h>
 #include <private/qresourcerelocater_p.h>
 
 #include <algorithm>
@@ -266,7 +267,8 @@ int main(int argc, char **argv)
                 logger.setSilent(true);
 
             QQmlJSAotCompiler cppCodeGen(
-                        &importer, u':' + inputResourcePath, parser.values(importsOption), &logger);
+                    &importer, u':' + inputResourcePath,
+                    QQmlJSUtils::cleanPaths(parser.values(importsOption)), &logger);
 
             if (!qCompileQmlFile(inputFile, saveFunction, &cppCodeGen, &error,
                                  /* storeSourceLocation */ true)) {
diff --git a/tools/qmllint/main.cpp b/tools/qmllint/main.cpp
index c11264452e..8bb748374b 100644
--- a/tools/qmllint/main.cpp
+++ b/tools/qmllint/main.cpp
@@ -3,9 +3,10 @@
 
 #include "../shared/qqmltoolingsettings.h"
 
-#include <QtQmlCompiler/private/qqmljsresourcefilemapper_p.h>
 #include <QtQmlCompiler/private/qqmljscompiler_p.h>
 #include <QtQmlCompiler/private/qqmljslinter_p.h>
+#include <QtQmlCompiler/private/qqmljsresourcefilemapper_p.h>
+#include <QtQmlCompiler/private/qqmljsutils_p.h>
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qfile.h>
@@ -269,7 +270,7 @@ All warnings can be set to three levels:
 
     QStringList defaultQmldirFiles;
     if (parser.isSet(qmldirFilesOption)) {
-        defaultQmldirFiles = parser.values(qmldirFilesOption);
+        defaultQmldirFiles = QQmlJSUtils::cleanPaths(parser.values(qmldirFilesOption));
     } else if (!parser.isSet(qmlImportNoDefault)){
         // If nothing given explicitly, use the qmldir file from the current directory.
         QFileInfo qmldirFile(QStringLiteral("qmldir"));
diff --git a/tools/qmlls/qqmlcodemodel.cpp b/tools/qmlls/qqmlcodemodel.cpp
index 9c3521aa57..2dd58ffe45 100644
--- a/tools/qmlls/qqmlcodemodel.cpp
+++ b/tools/qmlls/qqmlcodemodel.cpp
@@ -571,7 +571,7 @@ QStringList QQmlCodeModel::buildPathsForFileUrl(const QByteArray &url)
         QString dirName = d.dirName();
         QDateTime lastModified;
         while (d.cdUp() && --iDir > 0) {
-            for (const QFileInfo &fInfo : d.entryInfoList(QDir::Dirs)) {
+            for (const QFileInfo &fInfo : d.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot)) {
                 if (fInfo.completeBaseName() == u"build"
                     || fInfo.completeBaseName().startsWith(u"build-%1"_s.arg(dirName))) {
                     if (iDir > 1)
@@ -594,7 +594,7 @@ QStringList QQmlCodeModel::buildPathsForFileUrl(const QByteArray &url)
         res += bPath;
         if (QFile::exists(bPath + u"/_deps") && bPath.split(u"/_deps/"_s).size() < maxDeps) {
             QDir d(bPath + u"/_deps");
-            for (const QFileInfo &fInfo : d.entryInfoList(QDir::Dirs))
+            for (const QFileInfo &fInfo : d.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot))
                 buildPaths.append(fInfo.absoluteFilePath());
         }
     }
diff --git a/tools/qmltc/main.cpp b/tools/qmltc/main.cpp
index 7138343038..d4fca9be62 100644
--- a/tools/qmltc/main.cpp
+++ b/tools/qmltc/main.cpp
@@ -9,6 +9,7 @@
 
 #include <private/qqmljscompiler_p.h>
 #include <private/qqmljsresourcefilemapper_p.h>
+#include <private/qqmljsutils_p.h>
 
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qurl.h>
@@ -161,7 +162,7 @@ int main(int argc, char **argv)
     if (!parser.isSet(bareOption))
         importPaths.append(QLibraryInfo::path(QLibraryInfo::QmlImportsPath));
 
-    QStringList qmldirFiles = parser.values(qmldirOption);
+    QStringList qmldirFiles = QQmlJSUtils::cleanPaths(parser.values(qmldirOption));
 
     QString outputCppFile;
     if (!parser.isSet(outputCppOption)) {