diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2023-06-19 09:29:34 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2023-06-30 10:47:17 +0200 |
| commit | b9bfdea0e2c6721d2306af0ecc44f88da9988957 (patch) | |
| tree | 2cfc6b8f9b43a221d0cdb4c92d0bd868696ab952 /src/qml/qml/qqmlvmemetaobject.cpp | |
| parent | 975a6bff84815f536abf1324394193b8180edeaa (diff) | |
QML: Un-specialcase QStringList and QVariantList conversion
Those are just regular sequences these days. They can be written back.
Drop some now-dead code and deduplicate the value type conversion code
in the process. We should try the (more common) value type conversion
before the sequence conversion, but after all the "simple" conversions.
[ChangeLog][QtQml][Important Behavior Changes] Converting a QVariantList
to a QJSValue via, for example QJSEngine::toScriptValue() does not
produce a JavaScript array anymore, but rather a better suited sequence
object that behaves almost like a JavaScript array. The only difference
is that its QJSValue::isArray() will return false now.
Fixes: QTBUG-113690
Change-Id: Ib176c34d59c45a6b5cff68d029c4b1b87d7aa192
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index 08e89f7e91..fb90e3e800 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -21,6 +21,8 @@ #include <private/qqmlpropertycachemethodarguments_p.h> #include <private/qqmlvaluetypewrapper_p.h> +#include <QtCore/qsequentialiterable.h> + #include <climits> // for CHAR_BIT QT_BEGIN_NAMESPACE @@ -864,8 +866,20 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void * needActivate = true; } } else { - QV4::ScopedValue sequence(scope, QV4::SequencePrototype::fromData( - engine, propType, a[0])); + if (const QQmlType type = QQmlMetaType::qmlListType(propType); + type.isSequentialContainer()) { + sequence = QV4::SequencePrototype::fromData( + engine, propType, type.listMetaSequence(), a[0]); + } else if (QSequentialIterable iterable; + QMetaType::convert( + propType, a[0], + QMetaType::fromType<QSequentialIterable>(), + &iterable)) { + sequence = QV4::SequencePrototype::fromData( + engine, propType, iterable.metaContainer(), a[0]); + } else { + sequence = QV4::Encode::undefined(); + } md->set(engine, id, sequence); if (sequence->isUndefined()) { qmlWarning(object) |