diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-17 11:03:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:20 +0200 |
| commit | 3c53da05229789295cbf75174844c2b3df3db25c (patch) | |
| tree | 2fcfac8a967e89c5d618ed72d2debfb3c9521d90 /src/qml/jsruntime/qv4objectiterator.cpp | |
| parent | e6f3bcf66e0d154866e96a51b6ab2736ef5e2dc3 (diff) | |
Fix Scoped(Value) assignment/construction on 32-bit
Make sure to also set the tag value correctly.
Change-Id: I3c6589d25b3a20f255581fb4c9248abfe6af3594
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4objectiterator.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4objectiterator.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4objectiterator.cpp b/src/qml/jsruntime/qv4objectiterator.cpp index 581380a1fd..216700fe69 100644 --- a/src/qml/jsruntime/qv4objectiterator.cpp +++ b/src/qml/jsruntime/qv4objectiterator.cpp @@ -56,6 +56,10 @@ ObjectIterator::ObjectIterator(Value *scratch1, Value *scratch2, Object *o, uint { object->o = o; current->o = o; +#if QT_POINTER_SIZE == 4 + object->tag = QV4::Value::Managed_Type; + current->tag = QV4::Value::Managed_Type; +#endif if (object->as<ArgumentsObject>()) { Scope scope(object->engine()); @@ -73,6 +77,10 @@ ObjectIterator::ObjectIterator(Scope &scope, Object *o, uint flags) { object->o = o; current->o = o; +#if QT_POINTER_SIZE == 4 + object->tag = QV4::Value::Managed_Type; + current->tag = QV4::Value::Managed_Type; +#endif if (object->as<ArgumentsObject>()) { Scope scope(object->engine()); |