1 files changed, 39 insertions, 13 deletions

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 86e178d568..1efe09c59f 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -1266,20 +1266,15 @@ QUrl ExecutionEngine::resolvedUrl(const QString &file)
 
 void ExecutionEngine::markObjects(MarkStack *markStack)
 {
-    for (int i = 0; i < NClasses; ++i)
-        if (classes[i]) {
-            classes[i]->mark(markStack);
-            if (markStack->top >= markStack->limit)
-                markStack->drain();
-        }
-    markStack->drain();
+    for (int i = 0; i < NClasses; ++i) {
+        if (Heap::InternalClass *c = classes[i])
+            c->mark(markStack);
+    }
 
     identifierTable->markObjects(markStack);
 
-    for (auto compilationUnit: compilationUnits) {
+    for (auto compilationUnit: compilationUnits)
         compilationUnit->markObjects(markStack);
-        markStack->drain();
-    }
 }
 
 ReturnedValue ExecutionEngine::throwError(const Value &value)
@@ -1512,12 +1507,41 @@ static QVariant toVariant(QV4::ExecutionEngine *e, const QV4::Value &value, int
             return QVariant::fromValue(QV4::JsonObject::toJsonArray(a));
         }
 
+        QVariant retn;
 #if QT_CONFIG(qml_sequence_object)
         bool succeeded = false;
-        QVariant retn = QV4::SequencePrototype::toVariant(value, typeHint, &succeeded);
+        retn = QV4::SequencePrototype::toVariant(value, typeHint, &succeeded);
         if (succeeded)
             return retn;
 #endif
+        if (typeHint != -1) {
+            // the QVariant constructor will create a copy, so we have manually
+            // destroy the value returned by QMetaType::create
+            auto temp = QMetaType::create(typeHint);
+            retn = QVariant(typeHint, temp);
+            QMetaType::destroy(typeHint, temp);
+            auto retnAsIterable = retn.value<QtMetaTypePrivate::QSequentialIterableImpl>();
+            if (retnAsIterable._iteratorCapabilities & QtMetaTypePrivate::ContainerIsAppendable) {
+                auto const length = a->getLength();
+                QV4::ScopedValue arrayValue(scope);
+                for (qint64 i = 0; i < length; ++i) {
+                    arrayValue = a->get(i);
+                    QVariant asVariant = toVariant(e, arrayValue, retnAsIterable._metaType_id, false, visitedObjects);
+                    auto originalType = asVariant.userType();
+                    bool couldConvert = asVariant.convert(retnAsIterable._metaType_id);
+                    if (!couldConvert) {
+                        qWarning() << QLatin1String("Could not convert array value at position %1 from %2 to %3")
+                                                    .arg(QString::number(i),
+                                                         QString::fromUtf8(QMetaType::typeName(originalType)),
+                                                         QString::fromUtf8(QMetaType::typeName(retnAsIterable._metaType_id)));
+                        // create default constructed value
+                        asVariant = QVariant(retnAsIterable._metaType_id, nullptr);
+                    }
+                    retnAsIterable.append(asVariant.constData());
+                }
+                return retn;
+            }
+        }
     }
 
     if (value.isUndefined())
@@ -1886,10 +1910,10 @@ QQmlRefPointer<ExecutableCompilationUnit> ExecutionEngine::compileModule(
                                                  sourceCode, sourceTimeStamp, &diagnostics);
     for (const QQmlJS::DiagnosticMessage &m : diagnostics) {
         if (m.isError()) {
-            throwSyntaxError(m.message, url.toString(), m.line, m.column);
+            throwSyntaxError(m.message, url.toString(), m.loc.startLine, m.loc.startColumn);
             return nullptr;
         } else {
-            qWarning() << url << ':' << m.line << ':' << m.column
+            qWarning() << url << ':' << m.loc.startLine << ':' << m.loc.startColumn
                       << ": warning: " << m.message;
         }
     }
@@ -2331,9 +2355,11 @@ int ExecutionEngine::registerExtension()
     return registrationData()->extensionCount++;
 }
 
+#if QT_CONFIG(qml_network)
 QNetworkAccessManager *QV4::detail::getNetworkAccessManager(ExecutionEngine *engine)
 {
     return engine->qmlEngine()->networkAccessManager();
 }
+#endif // qml_network
 
 QT_END_NAMESPACE