From 3e84f76bbc7a3fe0a8428be3cd6340401065ad23 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 10 Nov 2014 16:06:43 +0100 Subject: Store Heap objects in the qml binding wrapper Change-Id: I7fae0710d148a2b07ec5f36a7fb96c2b645e564e Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4script_p.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/qml/jsruntime/qv4script_p.h') diff --git a/src/qml/jsruntime/qv4script_p.h b/src/qml/jsruntime/qv4script_p.h index 3379e204e1..3da8cf0269 100644 --- a/src/qml/jsruntime/qv4script_p.h +++ b/src/qml/jsruntime/qv4script_p.h @@ -76,8 +76,8 @@ struct QmlBindingWrapper : Heap::FunctionObject { QmlBindingWrapper(QV4::ExecutionContext *scope, Function *f, QV4::Object *qml); // Constructor for QML functions and signal handlers, resulting binding wrapper is not callable! QmlBindingWrapper(QV4::ExecutionContext *scope, QV4::Object *qml); - QV4::Object *qml; - QV4::CallContext *qmlContext; + Object *qml; + CallContext *qmlContext; }; } @@ -88,7 +88,7 @@ struct Q_QML_EXPORT QmlBindingWrapper : FunctionObject { static ReturnedValue call(Managed *that, CallData *); static void markObjects(Heap::Base *m, ExecutionEngine *e); - CallContext *context() const { return d()->qmlContext; } + Heap::CallContext *context() const { return d()->qmlContext; } static Returned *createQmlCallableForFunction(QQmlContextData *qmlContext, QObject *scopeObject, QV4::Function *runtimeFunction, const QList &signalParameters = QList(), QString *error = 0); -- cgit v1.2.3