aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4sequenceobject.cpp
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2022-09-13 14:57:47 +0200
committerUlf Hermann <ulf.hermann@qt.io>2022-09-20 08:54:42 +0200
commita2db40e6c070017960b9f815c66cab354e3466dc (patch)
treee549b977fb738cd0092d801d54025c0cff79414c /src/qml/jsruntime/qv4sequenceobject.cpp
parent85ba26c64488b76bf7fac37bc001d9762188009a (diff)
V4: Make ExecutionEngine::toVariant() static
Wherever we need an engine in there, we also have a managed value to get it from. This relieves us from the requirement to drag an engine around wherever we want to call toVariant(). Change-Id: Ib95d02b5fbf5eaa494214e337c9b700e97e5e0df Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4sequenceobject.cpp')
-rw-r--r--src/qml/jsruntime/qv4sequenceobject.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp
index 6ed27d9d02..cb36ece6a4 100644
--- a/src/qml/jsruntime/qv4sequenceobject.cpp
+++ b/src/qml/jsruntime/qv4sequenceobject.cpp
@@ -306,7 +306,7 @@ bool Sequence::containerPutIndexed(qsizetype index, const Value &value)
const qsizetype count = size();
const QMetaType valueType = valueMetaType(d());
- const QVariant element = engine()->toVariant(value, valueType, false);
+ const QVariant element = ExecutionEngine::toVariant(value, valueType, false);
if (index < 0)
return false;
@@ -643,7 +643,7 @@ QVariant SequencePrototype::toVariant(const QV4::Value &array, QMetaType typeHin
QV4::ScopedValue v(scope);
for (quint32 i = 0; i < quint32(length); ++i) {
const QMetaType valueMetaType = priv->typeId;
- QVariant variant = scope.engine->toVariant(a->get(i), valueMetaType, false);
+ QVariant variant = ExecutionEngine::toVariant(a->get(i), valueMetaType, false);
if (valueMetaType == QMetaType::fromType<QVariant>()) {
meta->addValueAtEnd(result.data(), &variant);
} else {