Long live QML inline components

[ChangeLog][QtQml] It is now possible to declare new QML components in
a QML file via the component keyword. They can be used just as if they
were declared in another file, with the only difference that the type
name needs to be prefixed with the name of the containing type outside
of the file were the inline component has been declared.

Notably, inline components are not closures: In the following
example, the output would be 42

// MyItem.qml
Item {
    property int i: 33
    component IC: Item {
        Component.onCompleted: console.log(i)
    }
}
// user.qml
Item {
    property int i: 42
    MyItem.IC {}
}

Fixes: QTBUG-79382
Change-Id: I6a5ffc43f093a76323f435cfee9bab217781b8f5
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 10 insertions, 11 deletions

diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h
index 80126cbffb..037cf89beb 100644
--- a/src/qml/qml/qqmlmetatype_p.h
+++ b/src/qml/qml/qqmlmetatype_p.h
@@ -63,6 +63,15 @@ class QQmlError;
 
 namespace QV4 { class ExecutableCompilationUnit; }
 
+struct CompositeMetaTypeIds
+{
+    int id = -1;
+    int listId = -1;
+    CompositeMetaTypeIds() = default;
+    CompositeMetaTypeIds(int id, int listId) : id(id), listId(listId) {}
+    bool isValid() const { return id != -1 && listId != -1; }
+};
+
 class Q_QML_PRIVATE_EXPORT QQmlMetaType
 {
 public:
@@ -80,18 +89,8 @@ public:
 
     static void unregisterType(int type);
 
-    struct CompositeMetaTypeIds
-    {
-        int id = -1;
-        int listId = -1;
-        CompositeMetaTypeIds() = default;
-        CompositeMetaTypeIds(int id, int listId) : id(id), listId(listId) {}
-        bool isValid() const { return id != -1 && listId != -1; }
-    };
-
     static CompositeMetaTypeIds registerInternalCompositeType(const QByteArray &className);
-    static void unregisterInternalCompositeType(const QQmlMetaType::CompositeMetaTypeIds &typeIds);
-
+    static void unregisterInternalCompositeType(const CompositeMetaTypeIds &typeIds);
     static void registerModule(const char *uri, int versionMajor, int versionMinor);
     static bool protectModule(const QString &uri, int majVersion);