QML: Make mapping of sequence object in JS optional

qv4sequenceobject.o is the largest single object in QtQml.so. This is
probably due to template and macro explosion. Not everyone will want to
pay this price to have Qt containers natively available in JS.

Change-Id: I7dc64566a653c865d5c1b6e4f21a3a9089db100a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

9 files changed, 63 insertions, 6 deletions

diff --git a/src/qml/configure.json b/src/qml/configure.json
index 3bb7b8ce54..8e725fd374 100644
--- a/src/qml/configure.json
+++ b/src/qml/configure.json
@@ -45,6 +45,12 @@
             "purpose": "Provides the QmlDevtools library and various utilities.",
             "section": "QML",
             "output": [ "privateFeature" ]
+        },
+        "qml-sequence-object": {
+            "label": "QML sequence object",
+            "purpose": "Supports mapping sequence types into QML.",
+            "section": "QML",
+            "output": [ "privateFeature" ]
         }
     },
 
@@ -53,7 +59,8 @@
             "section": "Qt QML",
             "entries": [
                 "qml-network",
-                "qml-debug"
+                "qml-debug",
+                "qml-sequence-object"
             ]
         }
     ]
diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri
index 4bc877bd9d..1ec00cc744 100644
--- a/src/qml/jsruntime/jsruntime.pri
+++ b/src/qml/jsruntime/jsruntime.pri
@@ -36,7 +36,6 @@ SOURCES += \
     $$PWD/qv4runtimecodegen.cpp \
     $$PWD/qv4serialize.cpp \
     $$PWD/qv4script.cpp \
-    $$PWD/qv4sequenceobject.cpp \
     $$PWD/qv4include.cpp \
     $$PWD/qv4qobjectwrapper.cpp \
     $$PWD/qv4arraybuffer.cpp \
@@ -89,7 +88,6 @@ HEADERS += \
     $$PWD/qv4script_p.h \
     $$PWD/qv4scopedvalue_p.h \
     $$PWD/qv4executableallocator_p.h \
-    $$PWD/qv4sequenceobject_p.h \
     $$PWD/qv4include_p.h \
     $$PWD/qv4qobjectwrapper_p.h \
     $$PWD/qv4profiling_p.h \
@@ -98,6 +96,14 @@ HEADERS += \
     $$PWD/qv4dataview_p.h \
     $$PWD/qv4vme_moth_p.h
 
+qtConfig(qml-sequence-object) {
+    HEADERS += \
+        $$PWD/qv4sequenceobject_p.h
+
+    SOURCES += \
+        $$PWD/qv4sequenceobject.cpp
+}
+
 }
 
 
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index e7a8312b5b..15c6e98ea7 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -63,7 +63,11 @@
 #include "qv4debugging_p.h"
 #include "qv4profiling_p.h"
 #include "qv4executableallocator_p.h"
+
+#if QT_CONFIG(qml_sequence_object)
 #include "qv4sequenceobject_p.h"
+#endif
+
 #include "qv4qobjectwrapper_p.h"
 #include "qv4memberdata_p.h"
 #include "qv4arraybuffer_p.h"
@@ -344,8 +348,10 @@ ExecutionEngine::ExecutionEngine(QJSEngine *jsEngine)
     jsObjects[VariantProto] = memoryManager->allocObject<VariantPrototype>();
     Q_ASSERT(variantPrototype()->prototype() == objectPrototype()->d());
 
+#if QT_CONFIG(qml_sequence_object)
     ic = newInternalClass(SequencePrototype::staticVTable(), SequencePrototype::defaultPrototype(this));
     jsObjects[SequenceProto] = ScopedValue(scope, memoryManager->allocObject<SequencePrototype>(ic, SequencePrototype::defaultPrototype(this)));
+#endif
 
     ExecutionContext *global = rootContext();
     jsObjects[Object_Ctor] = memoryManager->allocObject<ObjectCtor>(global);
@@ -380,10 +386,11 @@ ExecutionEngine::ExecutionEngine(QJSEngine *jsEngine)
     static_cast<SyntaxErrorPrototype *>(syntaxErrorPrototype())->init(this, syntaxErrorCtor());
     static_cast<TypeErrorPrototype *>(typeErrorPrototype())->init(this, typeErrorCtor());
     static_cast<URIErrorPrototype *>(uRIErrorPrototype())->init(this, uRIErrorCtor());
-
     static_cast<VariantPrototype *>(variantPrototype())->init();
-    sequencePrototype()->cast<SequencePrototype>()->init();
 
+#if QT_CONFIG(qml_sequence_object)
+    sequencePrototype()->cast<SequencePrototype>()->init();
+#endif
 
     // typed arrays
 
@@ -1139,8 +1146,11 @@ static QVariant toVariant(QV4::ExecutionEngine *e, const QV4::Value &value, int
             return v->toVariant();
         } else if (QV4::QmlListWrapper *l = object->as<QV4::QmlListWrapper>()) {
             return l->toVariant();
-        } else if (object->isListType())
+#if QT_CONFIG(qml_sequence_object)
+        } else if (object->isListType()) {
             return QV4::SequencePrototype::toVariant(object);
+#endif
+        }
     }
 
     if (value.as<ArrayObject>()) {
@@ -1163,10 +1173,12 @@ static QVariant toVariant(QV4::ExecutionEngine *e, const QV4::Value &value, int
             return QVariant::fromValue(QV4::JsonObject::toJsonArray(a));
         }
 
+#if QT_CONFIG(qml_sequence_object)
         bool succeeded = false;
         QVariant retn = QV4::SequencePrototype::toVariant(value, typeHint, &succeeded);
         if (succeeded)
             return retn;
+#endif
     }
 
     if (value.isUndefined())
@@ -1343,6 +1355,7 @@ QV4::ReturnedValue QV4::ExecutionEngine::fromVariant(const QVariant &variant)
                 return QV4::Encode(newRegExpObject(*reinterpret_cast<const QRegExp *>(ptr)));
             case QMetaType::QObjectStar:
                 return QV4::QObjectWrapper::wrap(this, *reinterpret_cast<QObject* const *>(ptr));
+#if QT_CONFIG(qml_sequence_object)
             case QMetaType::QStringList:
                 {
                 bool succeeded = false;
@@ -1352,6 +1365,7 @@ QV4::ReturnedValue QV4::ExecutionEngine::fromVariant(const QVariant &variant)
                     return retn->asReturnedValue();
                 return QV4::Encode(newArrayObject(*reinterpret_cast<const QStringList *>(ptr)));
                 }
+#endif
             case QMetaType::QVariantList:
                 return arrayFromVariantList(this, *reinterpret_cast<const QVariantList *>(ptr));
             case QMetaType::QVariantMap:
@@ -1403,10 +1417,12 @@ QV4::ReturnedValue QV4::ExecutionEngine::fromVariant(const QVariant &variant)
         if (objOk)
             return QV4::QObjectWrapper::wrap(this, obj);
 
+#if QT_CONFIG(qml_sequence_object)
         bool succeeded = false;
         QV4::ScopedValue retn(scope, QV4::SequencePrototype::fromVariant(this, variant, &succeeded));
         if (succeeded)
             return retn->asReturnedValue();
+#endif
 
         if (const QMetaObject *vtmo = QQmlValueTypeFactory::metaObjectForMetaType(type))
             return QV4::QQmlValueTypeWrapper::create(this, variant, vtmo, type);
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index 72ade66765..61154d89a3 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -178,7 +178,9 @@ public:
         TypeErrorProto,
         URIErrorProto,
         VariantProto,
+#if QT_CONFIG(qml_sequence_object)
         SequenceProto,
+#endif
         ArrayBufferProto,
         DataViewProto,
         ValueTypeProto,
@@ -247,7 +249,9 @@ public:
     Object *typeErrorPrototype() const { return reinterpret_cast<Object *>(jsObjects + TypeErrorProto); }
     Object *uRIErrorPrototype() const { return reinterpret_cast<Object *>(jsObjects + URIErrorProto); }
     Object *variantPrototype() const { return reinterpret_cast<Object *>(jsObjects + VariantProto); }
+#if QT_CONFIG(qml_sequence_object)
     Object *sequencePrototype() const { return reinterpret_cast<Object *>(jsObjects + SequenceProto); }
+#endif
 
     Object *arrayBufferPrototype() const { return reinterpret_cast<Object *>(jsObjects + ArrayBufferProto); }
     Object *dataViewPrototype() const { return reinterpret_cast<Object *>(jsObjects + DataViewProto); }
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index 948dcdb24d..4e72539c1d 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -56,7 +56,11 @@
 #include <private/qv4functionobject_p.h>
 #include <private/qv4runtime_p.h>
 #include <private/qv4variantobject_p.h>
+
+#if QT_CONFIG(qml_sequence_object)
 #include <private/qv4sequenceobject_p.h>
+#endif
+
 #include <private/qv4objectproto_p.h>
 #include <private/qv4jsonobject_p.h>
 #include <private/qv4regexpobject_p.h>
@@ -181,11 +185,13 @@ static QV4::ReturnedValue loadProperty(QV4::ExecutionEngine *v4, QObject *object
         if (const QMetaObject *valueTypeMetaObject = QQmlValueTypeFactory::metaObjectForMetaType(property.propType()))
             return QV4::QQmlValueTypeWrapper::create(v4, object, property.coreIndex(), valueTypeMetaObject, property.propType());
     } else {
+#if QT_CONFIG(qml_sequence_object)
         // see if it's a sequence type
         bool succeeded = false;
         QV4::ScopedValue retn(scope, QV4::SequencePrototype::newSequence(v4, property.propType(), object, property.coreIndex(), &succeeded));
         if (succeeded)
             return retn->asReturnedValue();
+#endif
     }
 
     if (property.propType() == QMetaType::UnknownType) {
@@ -1611,6 +1617,7 @@ void CallArgument::initAsType(int callType)
     }
 }
 
+#if QT_CONFIG(qml_sequence_object)
 template <class T, class M>
 void CallArgument::fromContainerValue(const QV4::Object *object, int callType, M CallArgument::*member, bool &queryEngine)
 {
@@ -1623,6 +1630,7 @@ void CallArgument::fromContainerValue(const QV4::Object *object, int callType, M
     }
   }
 }
+#endif
 
 void CallArgument::fromValue(int callType, QV4::ExecutionEngine *engine, const QV4::Value &value)
 {
@@ -1705,6 +1713,7 @@ void CallArgument::fromValue(int callType, QV4::ExecutionEngine *engine, const Q
         type = callType;
     } else if (callType == QMetaType::Void) {
         *qvariantPtr = QVariant();
+#if QT_CONFIG(qml_sequence_object)
     } else if (callType == qMetaTypeId<std::vector<int>>()
                || callType == qMetaTypeId<std::vector<qreal>>()
                || callType == qMetaTypeId<std::vector<bool>>()
@@ -1732,6 +1741,7 @@ void CallArgument::fromValue(int callType, QV4::ExecutionEngine *engine, const Q
             stdVectorQModelIndexPtr = nullptr;
             fromContainerValue<std::vector<QModelIndex>>(object, callType, &CallArgument::stdVectorQModelIndexPtr, queryEngine);
         }
+#endif
     } else {
         queryEngine = true;
     }
diff --git a/src/qml/jsruntime/qv4sequenceobject_p.h b/src/qml/jsruntime/qv4sequenceobject_p.h
index e9bef2f604..eab1ffb5d7 100644
--- a/src/qml/jsruntime/qv4sequenceobject_p.h
+++ b/src/qml/jsruntime/qv4sequenceobject_p.h
@@ -59,6 +59,8 @@
 #include "qv4context_p.h"
 #include "qv4string_p.h"
 
+QT_REQUIRE_CONFIG(qml_sequence_object);
+
 QT_BEGIN_NAMESPACE
 
 namespace QV4 {
diff --git a/src/qml/jsruntime/qv4serialize.cpp b/src/qml/jsruntime/qv4serialize.cpp
index 14def49d0a..9bb226a1af 100644
--- a/src/qml/jsruntime/qv4serialize.cpp
+++ b/src/qml/jsruntime/qv4serialize.cpp
@@ -46,7 +46,9 @@
 #include <private/qv4value_p.h>
 #include <private/qv4dateobject_p.h>
 #include <private/qv4regexpobject_p.h>
+#if QT_CONFIG(qml_sequence_object)
 #include <private/qv4sequenceobject_p.h>
+#endif
 #include <private/qv4objectproto_p.h>
 #include <private/qv4qobjectwrapper_p.h>
 
@@ -83,7 +85,9 @@ enum Type {
     WorkerDate,
     WorkerRegexp,
     WorkerListModel,
+#if QT_CONFIG(qml_sequence_object)
     WorkerSequence
+#endif
 };
 
 static inline quint32 valueheader(Type type, quint32 size = 0)
@@ -239,6 +243,7 @@ void Serialize::serialize(QByteArray &data, const QV4::Value &v, ExecutionEngine
         // No other QObject's are allowed to be sent
         push(data, valueheader(WorkerUndefined));
     } else if (const Object *o = v.as<Object>()) {
+#if QT_CONFIG(qml_sequence_object)
         if (o->isListType()) {
             // valid sequence.  we generate a length (sequence length + 1 for the sequence type)
             uint seqLength = ScopedValue(scope, o->get(engine->id_length()))->toUInt32();
@@ -256,6 +261,7 @@ void Serialize::serialize(QByteArray &data, const QV4::Value &v, ExecutionEngine
 
             return;
         }
+#endif
 
         // regular object
         QV4::ScopedValue val(scope, v);
@@ -369,6 +375,7 @@ ReturnedValue Serialize::deserialize(const char *&data, ExecutionEngine *engine)
         agent->setEngine(engine);
         return rv->asReturnedValue();
     }
+#if QT_CONFIG(qml_sequence_object)
     case WorkerSequence:
     {
         ScopedValue value(scope);
@@ -387,6 +394,7 @@ ReturnedValue Serialize::deserialize(const char *&data, ExecutionEngine *engine)
         QVariant seqVariant = QV4::SequencePrototype::toVariant(array, sequenceType, &succeeded);
         return QV4::SequencePrototype::fromVariant(engine, seqVariant, &succeeded);
     }
+#endif
     }
     Q_ASSERT(!"Unreachable");
     return QV4::Encode::undefined();
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index 004673b5a6..8f56cfb835 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -39,7 +39,10 @@
 
 #include "qv8engine_p.h"
 
+#if QT_CONFIG(qml_sequence_object)
 #include "qv4sequenceobject_p.h"
+#endif
+
 #include "private/qjsengine_p.h"
 
 #include <private/qqmlbuiltinfunctions_p.h>
diff --git a/src/qml/qtqmlglobal.h b/src/qml/qtqmlglobal.h
index 6e92867cf5..e02dfa5ed4 100644
--- a/src/qml/qtqmlglobal.h
+++ b/src/qml/qtqmlglobal.h
@@ -52,6 +52,7 @@
 #  endif
 #else
 #  define QT_FEATURE_qml_debug -1
+#  define QT_FEATURE_qml_sequence_object 1
 #endif
 
 QT_BEGIN_NAMESPACE