Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into tqtc/lts-5.15-opensourcev5.15.12-lts-lgpl

Change-Id: Ia60d01835108b0a461791e56388eb3dfe90649e2

1 files changed, 2 insertions, 2 deletions

diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 4222d9ef46..37368bb794 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -182,11 +182,11 @@ QVariantMap pluginsForModulePath(const QString &modulePath) {
             } else if (sections.size() == 2 && sectionType != "module"
                        && sectionType != "typeinfo") {
                 componentFiles.append(modulePath + QLatin1Char('/')
-                                      + QString::fromUtf8(sections.at(1)));
+                                      + QString::fromUtf8(sections.at(1)).trimmed());
             } else if (sections.size() == 3
                        || (sectionType == "singleton" && sections.size() == 4)) {
                 int fileNameIndex = (sectionType == "singleton") ? 3 : 2;
-                const QString fileName = QString::fromUtf8(sections.at(fileNameIndex));
+                const QString fileName = QString::fromUtf8(sections.at(fileNameIndex)).trimmed();
                 const QString filePath = modulePath + QLatin1Char('/') + fileName;
                 if (fileName.endsWith(QLatin1String(".js"))
                     || fileName.endsWith(QLatin1String(".mjs")))