diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-18 21:22:44 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-20 15:16:39 +0100 |
| commit | e7b66a60584b3fcb1436a7dbe8396b71cb69fe1b (patch) | |
| tree | 4ff62f582408df5e948063c18420f61b262c7334 /src/qml/jsruntime/qv4objectiterator.cpp | |
| parent | 74c658bb631fd5bab433b9867ff2e568a56ec082 (diff) | |
Make Managed inherit Value
This completes the first milestone towards being able to move
objects across the GC heap.
Change-Id: I8e6ce90254ea767188a31f0dc85b133534c87eb0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4objectiterator.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4objectiterator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4objectiterator.cpp b/src/qml/jsruntime/qv4objectiterator.cpp index a5a15711f7..f0970d160e 100644 --- a/src/qml/jsruntime/qv4objectiterator.cpp +++ b/src/qml/jsruntime/qv4objectiterator.cpp @@ -64,8 +64,8 @@ ObjectIterator::ObjectIterator(Scope &scope, Object *o, uint flags) void ObjectIterator::init(Object *o) { - object->m = o ? &o->data : 0; - current->m = o ? &o->data : 0; + object->m = o ? o->m : 0; + current->m = o ? o->m : 0; #if QT_POINTER_SIZE == 4 object->tag = QV4::Value::Managed_Type; |