diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-11-02 16:02:10 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-11-14 21:45:42 +0000 |
| commit | 002fdc48d43e4fd67921e0cd46c28d28aee06848 (patch) | |
| tree | 08fdc81dc91153649d8b6c6514ed3b49ad970064 /src/qml/jsruntime/qv4qobjectwrapper.cpp | |
| parent | 010197a42150ee73a17cb53fbe397a6c55b2d342 (diff) | |
Bring back markObjects(), this time generated
Doing the marking of objects in a function instead of
using the table seems to be somewhat faster.
Change-Id: I9ec00cc0264f9a15c69b285db493bee31d99bf96
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4qobjectwrapper.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index 9746b82817..6d7d929b61 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -1015,9 +1015,9 @@ static void markChildQObjectsRecursively(QObject *parent, QV4::MarkStack *markSt } } -void QObjectWrapper::markObjects(Heap::Base *that, QV4::MarkStack *markStack) +void Heap::QObjectWrapper::markObjects(Heap::Base *that, QV4::MarkStack *markStack) { - QObjectWrapper::Data *This = static_cast<QObjectWrapper::Data *>(that); + QObjectWrapper *This = static_cast<QObjectWrapper *>(that); if (QObject *o = This->object()) { QQmlVMEMetaObject *vme = QQmlVMEMetaObject::get(o); @@ -1032,7 +1032,7 @@ void QObjectWrapper::markObjects(Heap::Base *that, QV4::MarkStack *markStack) markChildQObjectsRecursively(o, markStack); } - QV4::Object::markObjects(that, markStack); + Object::markObjects(that, markStack); } void QObjectWrapper::destroyObject(bool lastCall) |