diff options
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4objectiterator.cpp | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4scopedvalue_p.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4objectiterator.cpp b/src/qml/jsruntime/qv4objectiterator.cpp index 7f97872092..1413f439b1 100644 --- a/src/qml/jsruntime/qv4objectiterator.cpp +++ b/src/qml/jsruntime/qv4objectiterator.cpp @@ -68,7 +68,7 @@ void ObjectIterator::init(const Object *o) object->setM(o ? o->m() : 0); current->setM(o ? o->m() : 0); -#if QT_POINTER_SIZE == 4 +#ifndef QV4_USE_64_BIT_VALUE_ENCODING object->setTag(QV4::Value::Managed_Type); current->setTag(QV4::Value::Managed_Type); #endif diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h index 101d3dcb3c..f6361681a5 100644 --- a/src/qml/jsruntime/qv4scopedvalue_p.h +++ b/src/qml/jsruntime/qv4scopedvalue_p.h @@ -120,7 +120,7 @@ struct ScopedValue { ptr = scope.engine->jsStackTop++; ptr->setM(o); -#if QT_POINTER_SIZE == 4 +#ifndef QV4_USE_64_BIT_VALUE_ENCODING ptr->setTag(QV4::Value::Managed_Type); #endif } @@ -144,7 +144,7 @@ struct ScopedValue ScopedValue &operator=(Heap::Base *o) { ptr->setM(o); -#if QT_POINTER_SIZE == 4 +#ifndef QV4_USE_64_BIT_VALUE_ENCODING ptr->setTag(QV4::Value::Managed_Type); #endif return *this; @@ -186,7 +186,7 @@ struct Scoped inline void setPointer(const Managed *p) { ptr->setM(p ? p->m() : 0); -#if QT_POINTER_SIZE == 4 +#ifndef QV4_USE_64_BIT_VALUE_ENCODING ptr->setTag(QV4::Value::Managed_Type); #endif } @@ -195,7 +195,7 @@ struct Scoped { ptr = scope.engine->jsStackTop++; ptr->setM(0); -#if QT_POINTER_SIZE == 4 +#ifndef QV4_USE_64_BIT_VALUE_ENCODING ptr->setTag(QV4::Value::Managed_Type); #endif } |