From 3c53da05229789295cbf75174844c2b3df3db25c Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 17 Jul 2014 11:03:08 +0200 Subject: Fix Scoped(Value) assignment/construction on 32-bit Make sure to also set the tag value correctly. Change-Id: I3c6589d25b3a20f255581fb4c9248abfe6af3594 Reviewed-by: Lars Knoll --- src/qml/jsruntime/qv4objectiterator.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/qml/jsruntime/qv4objectiterator.cpp') 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()) { 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()) { Scope scope(object->engine()); -- cgit v1.2.3