aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2015-01-23 16:03:02 +0100
committerLars Knoll <lars.knoll@digia.com>2015-01-23 16:18:54 +0100
commitc57bee9dda9857c3efbc34f3f0806a6cea705a9d (patch)
tree9f45fb3b58cbd6aceaa267307f4e1b72a916b431 /src/qml/jsruntime
parent43fe684d42d90dd76d7d6c946a37ec0002f703a8 (diff)
Properly mark all members in QObjectMethod
markObjects wasn't calling the parent implementation, so the members in Object and FunctionObject didn't get marked properly and thus collected early by the garbage collector. Change-Id: Iee036de909b68002db6d363263e739dcf857f024 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime')
-rw-r--r--src/qml/jsruntime/qv4qobjectwrapper.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index f0c94d2d0e..91ce345759 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -1893,6 +1893,8 @@ void QObjectMethod::markObjects(Heap::Base *that, ExecutionEngine *e)
QObjectMethod::Data *This = static_cast<QObjectMethod::Data*>(that);
This->qmlGlobal.mark(e);
This->valueTypeWrapper.mark(e);
+
+ FunctionObject::markObjects(that, e);
}
DEFINE_OBJECT_VTABLE(QObjectMethod);