Merge remote-tracking branch 'origin/5.14' into 5.15

 Conflicts:
	src/qml/jsruntime/qv4engine.cpp

Change-Id: I61f41672e2dfe7e542ca30fed5f173d0a9ee3412

1 files changed, 21 insertions, 19 deletions

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 0b2d657141..a900e710c2 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -1519,27 +1519,29 @@ static QVariant toVariant(QV4::ExecutionEngine *e, const QV4::Value &value, int
         if (succeeded)
             return retn;
 #endif
-        retn = QVariant(typeHint, QMetaType::create(typeHint));
-        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);
+        if (typeHint != -1) {
+            retn = QVariant(typeHint, QMetaType::create(typeHint));
+            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),
+                                                         QMetaType::typeName(originalType),
+                                                         QMetaType::typeName(retnAsIterable._metaType_id));
+                        // create default constructed value
+                        asVariant = QVariant(retnAsIterable._metaType_id, nullptr);
+                    }
+                    retnAsIterable.append(asVariant.constData());
                 }
-                retnAsIterable.append(asVariant.constData());
+                return retn;
             }
-            return retn;
         }
     }