From d009c0088bac6da4d775345a60e33fee22af22ce Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Wed, 24 Mar 2021 15:36:37 +0100 Subject: QV4::Engine::toVariant: Use metatype instead of metatype id This way, we can avoid the costly id to metatype lookup in case where we actually need the full metatype. Task-number: QTBUG-88766 Change-Id: Ibe29b323007f00d2f8d1807fb9b64f9a8f87e807 Reviewed-by: Ulf Hermann Reviewed-by: Andrei Golubev --- src/qml/qml/qqmlexpression.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/qml/qqmlexpression.cpp') diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp index 5864c3245c..cb9096ae66 100644 --- a/src/qml/qml/qqmlexpression.cpp +++ b/src/qml/qml/qqmlexpression.cpp @@ -281,7 +281,7 @@ QVariant QQmlExpressionPrivate::value(bool *isUndefined) QV4::Scope scope(engine->handle()); QV4::ScopedValue result(scope, v4value(isUndefined)); if (!hasError()) - rv = scope.engine->toVariant(result, -1); + rv = scope.engine->toVariant(result, QMetaType {}); } ep->dereferenceScarceResources(); // "release" scarce resources if top-level expression evaluation is complete. -- cgit v1.2.3