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

 Conflicts:
	tools/qmllint/findunqualified.cpp

Change-Id: I2593b5cc0db1d14e0c944aec4b88a80f46f5b0c1

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index c6076410b2..6d932c2665 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -318,6 +318,8 @@ private slots:
     void inlineComponentInSingleton();
     void nonExistingInlineComponent_data();
     void nonExistingInlineComponent();
+    void inlineComponentFoundBeforeOtherImports();
+    void inlineComponentDuplicateNameError();
 
     void selfReference();
     void selfReferencingSingleton();
@@ -5743,6 +5745,29 @@ void tst_qqmllanguage::nonExistingInlineComponent()
     QCOMPARE(error.column(), column);
 }
 
+void tst_qqmllanguage::inlineComponentFoundBeforeOtherImports()
+{
+    QQmlEngine engine;
+    QUrl url = testFileUrl("inlineComponentFoundBeforeOtherImports.qml");
+    QQmlComponent component(&engine, url);
+
+    QTest::ignoreMessage(QtMsgType::QtInfoMsg, "Created");
+    QScopedPointer<QObject> root {component.create()};
+}
+
+void tst_qqmllanguage::inlineComponentDuplicateNameError()
+{
+    QQmlEngine engine;
+    QUrl url = testFileUrl("inlineComponentDuplicateName.qml");
+    QQmlComponent component(&engine, url);
+
+    QString message = QLatin1String("%1:5 Inline component names must be unique per file\n").arg(url.toString());
+    QScopedPointer<QObject> root {component.create()};
+    QVERIFY(root.isNull());
+    QVERIFY(component.isError());
+    QCOMPARE(component.errorString(), message);
+}
+
 class TestItem : public QObject
 {
     Q_OBJECT