diff options
Diffstat (limited to 'src/qml/qml/qqmlbuiltinfunctions_p.h')
-rw-r--r-- | src/qml/qml/qqmlbuiltinfunctions_p.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/qml/qml/qqmlbuiltinfunctions_p.h b/src/qml/qml/qqmlbuiltinfunctions_p.h index 9ceedad28b..c2732e1aff 100644 --- a/src/qml/qml/qqmlbuiltinfunctions_p.h +++ b/src/qml/qml/qqmlbuiltinfunctions_p.h @@ -46,7 +46,6 @@ class Q_QML_EXPORT QtObject : public QObject QML_NAMED_ELEMENT(Qt) QML_SINGLETON QML_EXTENDED_NAMESPACE(Qt) - QML_ADDED_IN_VERSION(2, 0) Q_CLASSINFO("QML.StrictArguments", "true") @@ -199,10 +198,10 @@ struct ConsoleObject : Object { }; #define QQmlBindingFunctionMembers(class, Member) \ - Member(class, Pointer, FunctionObject *, bindingFunction) -DECLARE_HEAP_OBJECT(QQmlBindingFunction, FunctionObject) { + Member(class, Pointer, JavaScriptFunctionObject *, bindingFunction) +DECLARE_HEAP_OBJECT(QQmlBindingFunction, JavaScriptFunctionObject) { DECLARE_MARKOBJECTS(QQmlBindingFunction) - void init(const QV4::FunctionObject *bindingFunction); + void init(const QV4::JavaScriptFunctionObject *bindingFunction); }; } @@ -245,11 +244,14 @@ struct Q_QML_EXPORT GlobalExtensions { }; -struct QQmlBindingFunction : public QV4::FunctionObject +struct QQmlBindingFunction : public QV4::JavaScriptFunctionObject { - V4_OBJECT2(QQmlBindingFunction, FunctionObject) + V4_OBJECT2(QQmlBindingFunction, JavaScriptFunctionObject) - Heap::FunctionObject *bindingFunction() const { return d()->bindingFunction; } + static ReturnedValue virtualCall( + const FunctionObject *f, const Value *thisObject, const Value *argv, int argc); + + Heap::JavaScriptFunctionObject *bindingFunction() const { return d()->bindingFunction; } QQmlSourceLocation currentLocation() const; // from caller stack trace }; |