diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2022-09-13 14:57:47 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2022-09-20 08:54:42 +0200 |
| commit | a2db40e6c070017960b9f815c66cab354e3466dc (patch) | |
| tree | e549b977fb738cd0092d801d54025c0cff79414c /src/qml/jsapi/qjsvalue.cpp | |
| parent | 85ba26c64488b76bf7fac37bc001d9762188009a (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/jsapi/qjsvalue.cpp')
| -rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index 34fe760732..18ad1ebdfd 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -598,8 +598,10 @@ QVariant QJSValue::toVariant(QJSValue::ObjectConversionBehavior behavior) const if (val.isString()) return QVariant(val.toQString()); - if (QV4::Managed *m = val.as<QV4::Managed>()) - return m->engine()->toVariant(val, /*typeHint*/ QMetaType{}, behavior == RetainJSObjects); + if (val.as<QV4::Managed>()) { + return QV4::ExecutionEngine::toVariant( + val, /*typeHint*/ QMetaType{}, behavior == RetainJSObjects); + } Q_ASSERT(false); return QVariant(); |