diff options
author | Ivan Solovev <ivan.solovev@qt.io> | 2021-05-25 10:45:51 +0200 |
---|---|---|
committer | Ivan Solovev <ivan.solovev@qt.io> | 2021-05-25 11:26:15 +0200 |
commit | 8ac705247430ff6fbbc25a9db20c0e7dc572abe7 (patch) | |
tree | b62681e21db563a605f785e8a12f2ead3c958c5b /src/qml/jsruntime/qv4function.cpp | |
parent | 9184f6c1de2c315cc66eb6cd3886c3daea90516f (diff) | |
download | qtdeclarative-8ac705247430ff6fbbc25a9db20c0e7dc572abe7.tar.gz |
Revert "Do QMetaType-style call in QQmlPropertyBinding::evaluate"
This reverts commit 3a4e013f0058952c94ed3414aafbf96216efff8d.
The patch seems to break the tests in QtPositioning
(see QTBUG-93983 for some more details)
Task-number: QTBUG-93983
Change-Id: Ie2caa8418f06add1c24d9f3d3d137e51e94908c2
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4function.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4function.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp index f6001da1f8..348837c3a5 100644 --- a/src/qml/jsruntime/qv4function.cpp +++ b/src/qml/jsruntime/qv4function.cpp @@ -57,15 +57,15 @@ QT_BEGIN_NAMESPACE using namespace QV4; -bool Function::call(const Value *thisObject, void **a, const QMetaType *types, int argc, +void Function::call(const Value *thisObject, void **a, const QMetaType *types, int argc, const ExecutionContext *context) { if (!aotFunction) { - return QV4::convertAndCall( - context->engine(), thisObject, a, types, argc, - [this, context](const Value *thisObject, const Value *argv, int argc) { + QV4::convertAndCall(context->engine(), thisObject, a, types, argc, + [this, context](const Value *thisObject, const Value *argv, int argc) { return call(thisObject, argv, argc, context); }); + return; } ExecutionEngine *engine = context->engine(); @@ -77,7 +77,6 @@ bool Function::call(const Value *thisObject, void **a, const QMetaType *types, i engine->jsStackTop += frame.requiredJSStackFrameSize(); Moth::VME::exec(&frame, engine); frame.pop(engine); - return true; } ReturnedValue Function::call(const Value *thisObject, const Value *argv, int argc, const ExecutionContext *context) { |