QtQml: Integrate sequences with registration macros

You get to write QML_SEQUENTIAL_CONTAINER(value_type) now, and
qmltyperegistrar will generate a sensible registration call from that.
A registration might look like this:

struct MyStringListForeign
{
    Q_GADGET
    QML_ANONYMOUS
    QML_SEQUENTIAL_CONTAINER(QString)
    QML_FOREIGN(MyStringList)
    QML_ADDED_IN_VERSION(3, 1)
};

It's unfortunate that we need to use a metaobject to transfer all of
this information, but there is no other sensible way.

Transform the containers defined in qv4sequenceobject.cpp to use the new
style, and move them out of the builtins, into QtQml. Recognize that
only one of them was ever tested, and add tests for the rest.

Task-number: QTBUG-82443
Change-Id: I3a30f9e27266bb575eea26c5daf5dad1ec461cc5
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 46 insertions, 0 deletions

diff --git a/src/qml/qml/qqmlprivate.h b/src/qml/qml/qqmlprivate.h
index 19072f0751..feee3f8686 100644
--- a/src/qml/qml/qqmlprivate.h
+++ b/src/qml/qml/qqmlprivate.h
@@ -574,6 +574,19 @@ namespace QQmlPrivate
         const char *typeName;
         QMetaType typeId;
         QMetaSequence metaSequence;
+        QTypeRevision revision;
+    };
+
+    struct RegisterSequentialContainerAndRevisions {
+        int structVersion;
+        const char *uri;
+        QTypeRevision version;
+
+        const QMetaObject *classInfoMetaObject;
+        QMetaType typeId;
+        QMetaSequence metaSequence;
+
+        QVector<int> *qmlTypeIds;
     };
 
     struct AOTCompiledFunction {
@@ -605,6 +618,7 @@ namespace QQmlPrivate
         TypeAndRevisionsRegistration = 7,
         SingletonAndRevisionsRegistration = 8,
         SequentialContainerRegistration = 9,
+        SequentialContainerAndRevisionsRegistration = 10,
     };
 
     int Q_QML_EXPORT qmlregister(RegistrationType, void *);
@@ -717,6 +731,20 @@ namespace QQmlPrivate
     };
 
     template<class T, class = std::void_t<>>
+    struct QmlSequence
+    {
+        static constexpr bool Value = false;
+    };
+
+    template<class T>
+    struct QmlSequence<T, std::void_t<typename T::QmlIsSequence>>
+    {
+        Q_STATIC_ASSERT((std::is_same_v<typename T::QmlSequenceValueType,
+                                        typename QmlResolved<T>::Type::value_type>));
+        static constexpr bool Value = bool(T::QmlIsSequence::yes);
+    };
+
+    template<class T, class = std::void_t<>>
     struct QmlInterface
     {
         static constexpr bool Value = false;
@@ -823,6 +851,24 @@ namespace QQmlPrivate
         qmlregister(TypeAndRevisionsRegistration, &type);
     }
 
+    template<typename T>
+    void qmlRegisterSequenceAndRevisions(const char *uri, int versionMajor,
+                                         const QMetaObject *classInfoMetaObject,
+                                         QVector<int> *qmlTypeIds)
+    {
+        RegisterSequentialContainerAndRevisions type = {
+            0,
+            uri,
+            QTypeRevision::fromMajorVersion(versionMajor),
+            classInfoMetaObject,
+            QMetaType::fromType<T>(),
+            QMetaSequence::fromContainer<T>(),
+            qmlTypeIds
+        };
+
+        qmlregister(SequentialContainerAndRevisionsRegistration, &type);
+    }
+
     template<>
     void Q_QML_EXPORT qmlRegisterTypeAndRevisions<QQmlTypeNotAvailable, void>(
             const char *uri, int versionMajor, const QMetaObject *classInfoMetaObject,