From e887f25dd6c4c9630a7367c3a2ed95a284191843 Mon Sep 17 00:00:00 2001 From: Maximilian Goldstein Date: Tue, 9 Feb 2021 11:37:45 +0100 Subject: Fix QJSValue string parameters used in signals Pick-to: 6.1 6.0 5.15 Fixes: QTBUG-86482 Change-Id: If938fad22f51b08fe3cb20b94634efe46a1eed47 Reviewed-by: Ulf Hermann --- src/qml/qml/qqmlboundsignal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp index 5fd06da4bb..8fceb94f45 100644 --- a/src/qml/qml/qqmlboundsignal.cpp +++ b/src/qml/qml/qqmlboundsignal.cpp @@ -202,7 +202,7 @@ void QQmlBoundSignalExpression::evaluate(void **a) // for several cases (such as QVariant type and QObject-derived types) //args[ii] = engine->metaTypeToJS(type, a[ii + 1]); if (type == qMetaTypeId()) { - jsCall->args[ii] = QJSValuePrivate::asReturnedValue(reinterpret_cast(a[ii + 1])); + jsCall->args[ii] = QJSValuePrivate::convertToReturnedValue(v4, *reinterpret_cast(a[ii + 1])); } else if (type == QMetaType::QVariant) { jsCall->args[ii] = scope.engine->fromVariant(*((QVariant *)a[ii + 1])); } else if (type == QMetaType::Int) { -- cgit v1.2.3