Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	tools/qmllint/findunqualified.cpp

Change-Id: I2593b5cc0db1d14e0c944aec4b88a80f46f5b0c1

1 files changed, 4 insertions, 5 deletions

diff --git a/tools/qmllint/findunqualified.cpp b/tools/qmllint/findunqualified.cpp
index 6155ea4637..305dd65c66 100644
--- a/tools/qmllint/findunqualified.cpp
+++ b/tools/qmllint/findunqualified.cpp
@@ -43,6 +43,7 @@
 
 static const QString prefixedName(const QString &prefix, const QString &name)
 {
+    Q_ASSERT(!prefix.endsWith('.'));
     return prefix.isEmpty() ? name : (prefix  + QLatin1Char('.') + name);
 }
 
@@ -88,11 +89,9 @@ void FindUnqualifiedIDVisitor::parseHeaders(QQmlJS::AST::UiHeaderItemList *heade
                     uri = uri->next;
                 }
                 path.chop(1);
-                QString prefix = QLatin1String("");
-                if (import->asToken.isValid()) {
-                    prefix += import->importId + QLatin1Char('.');
-                }
-                importHelper(path, prefix, import->version->version);
+                importHelper(path,
+                             import->asToken.isValid() ? import->importId.toString() : QString(),
+                             import->version->version);
             }
         }
         header = header->next;