Propagate ImmediatePropertyNames through type registrar and QQmlJSScope

Change-Id: Ibaa2b86e823349ecf76e8199f2e68b8ad18d159a
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

2 files changed, 21 insertions, 0 deletions

diff --git a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp b/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp
index ef642ed984..23f3da7ddf 100644
--- a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp
+++ b/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp
@@ -321,6 +321,12 @@ void tst_qmltyperegistrar::deferredNames()
     QVERIFY(qmltypesData.contains("deferredNames: [\"A\", \"B\", \"C\"]"));
 }
 
+void tst_qmltyperegistrar::immediateNames()
+{
+    QVERIFY(qmltypesData.contains("immediateNames: [\"\"]"));
+    QVERIFY(qmltypesData.contains("immediateNames: [\"A\", \"B\", \"C\"]"));
+}
+
 void tst_qmltyperegistrar::derivedFromForeignPrivate()
 {
     QVERIFY(qmltypesData.contains("file: \"private/foreign_p.h\""));
diff --git a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.h b/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.h
index 62f22af420..a5549865d7 100644
--- a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.h
+++ b/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.h
@@ -418,6 +418,20 @@ struct DeferredPropertyNames : public QObject
     Q_CLASSINFO("DeferredPropertyNames", "A,B,C")
 };
 
+struct ImmediatePropertyNamesEmpty : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+    Q_CLASSINFO("ImmediatePropertyNames", "")
+};
+
+struct ImmediatePropertyNames : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+    Q_CLASSINFO("ImmediatePropertyNames", "A,B,C")
+};
+
 namespace ForeignNamespace
 {
 Q_NAMESPACE
@@ -471,6 +485,7 @@ private slots:
     void namespacesAndValueTypes();
     void namespaceExtendedNamespace();
     void deferredNames();
+    void immediateNames();
     void derivedFromForeignPrivate();
     void methodReturnType();