diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-15 09:38:17 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-15 14:03:48 +0200 |
| commit | 31ab6b81060abb0db0a68c88c61ea93c7d6bdc60 (patch) | |
| tree | 4bbf8f7d7ab63348417bb9faae4530288f3f482c /src/qml/jsruntime/qv4function.cpp | |
| parent | 719e7daab06d10c9cec0059d73096435a1589e00 (diff) | |
Allow AOT functions to signal an undefined result via the context
undefined as value returned from bindings has the special meaning of
resetting the binding. As AOT-compiled functions return the actual type
of the binding rather than a QV4::Value, we cannot always encode
undefined. Therefore, add a flag that tells us whether the result was
supposed to be undefined.
Pick-to: 6.2
Change-Id: Iac2298869dde80f6d889240dd8200b2ad83e5dc5
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4function.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4function.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp index 7b5685a2a0..95a7506c80 100644 --- a/src/qml/jsruntime/qv4function.cpp +++ b/src/qml/jsruntime/qv4function.cpp @@ -74,7 +74,7 @@ bool Function::call(QObject *thisObject, void **a, const QMetaType *types, int a frame.push(engine); Moth::VME::exec(&frame, engine); frame.pop(engine); - return true; + return !frame.isReturnValueUndefined(); } ReturnedValue Function::call( |