aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4function_p.h
diff options
context:
space:
mode:
authorUlf Hermann <[email protected]>2021-05-17 15:15:41 +0200
committerUlf Hermann <[email protected]>2021-06-02 21:04:35 +0200
commit278e8df17b073f96d8ff89d7a470fe63802ed15e (patch)
tree913403a98be4e09d101d48af6861ada2a3d1abc5 /src/qml/jsruntime/qv4function_p.h
parentc6c31740a7377715ce53fea5f323c4e48525e425 (diff)
Do QMetaType-style call in QQmlPropertyBinding::evaluate
We already have a void* and metatype available. There is no need to convert, unless we have bound arguments. The call() itself will convert as necessary anyway. However, we do need to figure out whether the returned value was undefined. Pass this information up from the actual call. This reverts commit 8ac705247430ff6fbbc25a9db20c0e7dc572abe7. The original commit 3a4e013f0058952c94ed3414aafbf96216efff8d was correct. We were just missing the value type conversions in metaTypeFromJS(). Change-Id: Ic4b2ebf1eb3fb2e5a50a045be774dd02d0fed7c6 Reviewed-by: Fabian Kosmale <[email protected]>
Diffstat (limited to 'src/qml/jsruntime/qv4function_p.h')
-rw-r--r--src/qml/jsruntime/qv4function_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4function_p.h b/src/qml/jsruntime/qv4function_p.h
index a15344dacd..7577161c01 100644
--- a/src/qml/jsruntime/qv4function_p.h
+++ b/src/qml/jsruntime/qv4function_p.h
@@ -100,7 +100,7 @@ public:
return compilationUnit->runtimeStrings[i];
}
- void call(const Value *thisObject, void **a, const QMetaType *types, int argc,
+ bool call(const Value *thisObject, void **a, const QMetaType *types, int argc,
const ExecutionContext *context);
ReturnedValue call(const Value *thisObject, const Value *argv, int argc, const ExecutionContext *context);