diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-02-19 11:10:51 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-02-19 18:12:29 +0100 |
| commit | 3b91f3a69a2679e69d056a53e9c7edc7e6d552a6 (patch) | |
| tree | 1f78b3f3bdac88ae74ad1a2e0cada101d7991cd2 /src/qml/jsruntime/qv4engine.cpp | |
| parent | 1a61ff978661cb2eb536dec4858158386320c2b4 (diff) | |
QV4::populateJSCallArguments: Use v4->metaTypeToJS
It appears that nowadays v4->metaTypeToJS handles QVariant and QObject
derived classes just fine, and in exactly the same way as the custom
code in populateJSCallArguments did.
Task-number: QTBUG-82931
Change-Id: Ic5f97dfc3296a409fdd6a1fcb78d3b9bdba5f3a1
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index fe35fe6193..38a21f87b5 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -2071,8 +2071,7 @@ ReturnedValue ExecutionEngine::callInContext(Function *function, QObject *self, // use JSCallData to pass arguments into the function call QV4::JSCallData jsCall(scope, types[0]); - QQmlEnginePrivate *ep = QQmlEnginePrivate::get(m_qmlEngine); - QV4::populateJSCallArguments(ep, this, jsCall, args, types); + QV4::populateJSCallArguments(this, jsCall, args, types); QV4::CallData *callData = jsCall->callData(); return function->call(selfValue, callData->argValues<QV4::Value>(), callData->argc(), |