Move model types into their own library

The model types are not part of the core QML runtime and should only be
loaded if you explicitly import them. We cannot enforce that in Qt5 as
some of them are available from the QtQml import, but we can change it
in Qt6.

Change-Id: I1e49e84d748e352537ec2d4af901c034c91d038f
Reviewed-by: Erik Verbruggen <erik.verbruggen@me.com>

7 files changed, 58 insertions, 37 deletions

diff --git a/src/qml/jsruntime/qv4dateobject_p.h b/src/qml/jsruntime/qv4dateobject_p.h
index 5b9934282c..a87eb92caf 100644
--- a/src/qml/jsruntime/qv4dateobject_p.h
+++ b/src/qml/jsruntime/qv4dateobject_p.h
@@ -96,7 +96,7 @@ struct DateObject: Object {
     double date() const { return d()->date; }
     void setDate(double date) { d()->date = date; }
 
-    QDateTime toQDateTime() const;
+    Q_QML_PRIVATE_EXPORT QDateTime toQDateTime() const;
 };
 
 template<>
diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h
index e03d49c74d..4fee26f341 100644
--- a/src/qml/jsruntime/qv4functionobject_p.h
+++ b/src/qml/jsruntime/qv4functionobject_p.h
@@ -87,11 +87,11 @@ DECLARE_HEAP_OBJECT(FunctionObject, Object) {
     }
 
     Q_QML_PRIVATE_EXPORT void init(QV4::ExecutionContext *scope, QV4::String *name, VTable::Call call);
-    void init(QV4::ExecutionContext *scope, QV4::String *name = nullptr);
-    void init(QV4::ExecutionContext *scope, QV4::Function *function, QV4::String *n = nullptr);
-    void init(QV4::ExecutionContext *scope, const QString &name);
-    void init();
-    void destroy();
+    Q_QML_PRIVATE_EXPORT void init(QV4::ExecutionContext *scope, QV4::String *name = nullptr);
+    Q_QML_PRIVATE_EXPORT void init(QV4::ExecutionContext *scope, QV4::Function *function, QV4::String *n = nullptr);
+    Q_QML_PRIVATE_EXPORT void init(QV4::ExecutionContext *scope, const QString &name);
+    Q_QML_PRIVATE_EXPORT void init();
+    Q_QML_PRIVATE_EXPORT void destroy();
 
     void setFunction(Function *f);
 
@@ -260,7 +260,7 @@ struct FunctionPrototype: FunctionObject
     static ReturnedValue method_hasInstance(const FunctionObject *, const Value *thisObject, const Value *argv, int argc);
 };
 
-struct IndexedBuiltinFunction : FunctionObject
+struct Q_QML_PRIVATE_EXPORT IndexedBuiltinFunction : FunctionObject
 {
     V4_OBJECT2(IndexedBuiltinFunction, FunctionObject)
 };
diff --git a/src/qml/jsruntime/qv4lookup_p.h b/src/qml/jsruntime/qv4lookup_p.h
index 7309749a81..f2e0afd797 100644
--- a/src/qml/jsruntime/qv4lookup_p.h
+++ b/src/qml/jsruntime/qv4lookup_p.h
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 
 namespace QV4 {
 
-struct Lookup {
+struct Q_QML_PRIVATE_EXPORT Lookup {
     union {
         ReturnedValue (*getter)(Lookup *l, ExecutionEngine *engine, const Value &object);
         ReturnedValue (*globalGetter)(Lookup *l, ExecutionEngine *engine);
diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h
index 567382cbc0..38055ef407 100644
--- a/src/qml/jsruntime/qv4object_p.h
+++ b/src/qml/jsruntime/qv4object_p.h
@@ -410,7 +410,7 @@ private:
     friend struct ObjectPrototype;
 };
 
-struct ObjectOwnPropertyKeyIterator : OwnPropertyKeyIterator
+struct Q_QML_PRIVATE_EXPORT ObjectOwnPropertyKeyIterator : OwnPropertyKeyIterator
 {
     uint arrayIndex = 0;
     uint memberIndex = 0;
diff --git a/src/qml/jsruntime/qv4propertykey_p.h b/src/qml/jsruntime/qv4propertykey_p.h
index 523afd4ccf..b2a2ec3dea 100644
--- a/src/qml/jsruntime/qv4propertykey_p.h
+++ b/src/qml/jsruntime/qv4propertykey_p.h
@@ -124,7 +124,7 @@ public:
         return m();
     }
 
-    bool isString() const;
+    Q_QML_EXPORT bool isString() const;
     bool isSymbol() const;
     bool isCanonicalNumericIndexString() const;
 
diff --git a/src/qml/jsruntime/qv4serialize.cpp b/src/qml/jsruntime/qv4serialize.cpp
index a84521e205..a5e62d3e35 100644
--- a/src/qml/jsruntime/qv4serialize.cpp
+++ b/src/qml/jsruntime/qv4serialize.cpp
@@ -39,11 +39,6 @@
 
 #include "qv4serialize_p.h"
 
-#if QT_CONFIG(qml_list_model)
-#include <private/qqmllistmodel_p.h>
-#include <private/qqmllistmodelworkeragent_p.h>
-#endif
-
 #include <private/qv4value_p.h>
 #include <private/qv4dateobject_p.h>
 #include <private/qv4regexpobject_p.h>
@@ -85,9 +80,7 @@ enum Type {
     WorkerNumber,
     WorkerDate,
     WorkerRegexp,
-#if QT_CONFIG(qml_list_model)
     WorkerListModel,
-#endif
 #if QT_CONFIG(qml_sequence_object)
     WorkerSequence
 #endif
@@ -235,18 +228,15 @@ void Serialize::serialize(QByteArray &data, const QV4::Value &v, ExecutionEngine
     } else if (const QObjectWrapper *qobjectWrapper = v.as<QV4::QObjectWrapper>()) {
         // XXX TODO: Generalize passing objects between the main thread and worker scripts so
         // that others can trivially plug in their elements.
-#if QT_CONFIG(qml_list_model)
-        QQmlListModel *lm = qobject_cast<QQmlListModel *>(qobjectWrapper->object());
-        if (lm && lm->agent()) {
-            QQmlListModelWorkerAgent *agent = lm->agent();
-            agent->addref();
-            push(data, valueheader(WorkerListModel));
-            push(data, (void *)agent);
-            return;
+        if (QObject *lm = qobjectWrapper->object()) {
+            if (QObject *agent = qvariant_cast<QObject *>(lm->property("agent"))) {
+                if (QMetaObject::invokeMethod(agent, "addref")) {
+                    push(data, valueheader(WorkerListModel));
+                    push(data, (void *)agent);
+                    return;
+                }
+            }
         }
-#else
-        Q_UNUSED(qobjectWrapper);
-#endif
         // No other QObject's are allowed to be sent
         push(data, valueheader(WorkerUndefined));
     } else if (const Object *o = v.as<Object>()) {
@@ -298,6 +288,41 @@ void Serialize::serialize(QByteArray &data, const QV4::Value &v, ExecutionEngine
     }
 }
 
+struct VariantRef
+{
+    VariantRef() : obj(nullptr) {}
+    VariantRef(const VariantRef &r) : obj(r.obj) { addref(); }
+    VariantRef(QObject *a) : obj(a) { addref(); }
+    ~VariantRef() { release(); }
+
+    VariantRef &operator=(const VariantRef &o) {
+        o.addref();
+        release();
+        obj = o.obj;
+        return *this;
+    }
+
+    void addref() const
+    {
+        if (obj)
+            QMetaObject::invokeMethod(obj, "addref");
+    }
+
+    void release() const
+    {
+        if (obj)
+            QMetaObject::invokeMethod(obj, "release");
+
+    }
+
+    QObject *obj;
+};
+
+QT_END_NAMESPACE
+Q_DECLARE_METATYPE(VariantRef)
+Q_DECLARE_METATYPE(QV4::ExecutionEngine *)
+QT_BEGIN_NAMESPACE
+
 ReturnedValue Serialize::deserialize(const char *&data, ExecutionEngine *engine)
 {
     quint32 header = popUint32(data);
@@ -366,24 +391,21 @@ ReturnedValue Serialize::deserialize(const char *&data, ExecutionEngine *engine)
         data += ALIGN(length * sizeof(quint16));
         return Encode(engine->newRegExpObject(pattern, flags));
     }
-#if QT_CONFIG(qml_list_model)
     case WorkerListModel:
     {
-        void *ptr = popPtr(data);
-        QQmlListModelWorkerAgent *agent = (QQmlListModelWorkerAgent *)ptr;
+        QObject *agent = reinterpret_cast<QObject *>(popPtr(data));
         QV4::ScopedValue rv(scope, QV4::QObjectWrapper::wrap(engine, agent));
         // ### Find a better solution then the ugly property
-        QQmlListModelWorkerAgent::VariantRef ref(agent);
+        VariantRef ref(agent);
         QVariant var = QVariant::fromValue(ref);
         QV4::ScopedValue v(scope, scope.engine->fromVariant(var));
         QV4::ScopedString s(scope, engine->newString(QStringLiteral("__qml:hidden:ref")));
         rv->as<Object>()->defineReadonlyProperty(s, v);
 
-        agent->release();
-        agent->setEngine(engine);
+        QMetaObject::invokeMethod(agent, "release");
+        agent->setProperty("engine", QVariant::fromValue(engine));
         return rv->asReturnedValue();
     }
-#endif
 #if QT_CONFIG(qml_sequence_object)
     case WorkerSequence:
     {
@@ -423,4 +445,3 @@ ReturnedValue Serialize::deserialize(const QByteArray &data, ExecutionEngine *en
 }
 
 QT_END_NAMESPACE
-
diff --git a/src/qml/jsruntime/qv4vtable_p.h b/src/qml/jsruntime/qv4vtable_p.h
index a4d91640c5..9dda104cd1 100644
--- a/src/qml/jsruntime/qv4vtable_p.h
+++ b/src/qml/jsruntime/qv4vtable_p.h
@@ -58,7 +58,7 @@ namespace QV4 {
 
 struct Lookup;
 
-struct OwnPropertyKeyIterator {
+struct Q_QML_PRIVATE_EXPORT OwnPropertyKeyIterator {
     virtual ~OwnPropertyKeyIterator() = 0;
     virtual PropertyKey next(const Object *o, Property *p = nullptr, PropertyAttributes *attrs = nullptr) = 0;
 };