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

 Conflicts:
	.qmake.conf
	src/qml/types/qqmlbind.cpp
	src/quick/items/qquicklistview.cpp
	tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp

Change-Id: Id6805c13256ad13d5651011e5dd09bba0ec02987

1 files changed, 24 insertions, 1 deletions

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 86e178d568..04650ab979 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -1512,12 +1512,35 @@ 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
+        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());
+            }
+            return retn;
+        }
     }
 
     if (value.isUndefined())