diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-10-12 23:00:20 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-10-12 23:00:20 +0300 |
| commit | 4826f86e274f1b29bd769e6790824f9e62a40f62 (patch) | |
| tree | c2cc4bb09ca91951a2641e33c3b0a65deb0af877 /tools/qmllint/main.cpp | |
| parent | 0f0972d542d9869c2dcfaf9c963d42ff32766460 (diff) | |
| parent | 844f9b9b376838bcb44324984876f8bf99d85d38 (diff) | |
Merge tag 'v6.5.7-lts-lgpl' into 6.56.5
Qt 6.5.7-lts-lgpl release
Diffstat (limited to 'tools/qmllint/main.cpp')
| -rw-r--r-- | tools/qmllint/main.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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")); |