diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-20 12:26:08 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-20 12:26:08 +0200 |
commit | cb6c208c77e2e3c8b6d5957fae73f0326eee4296 (patch) | |
tree | cd4a956eb3208358c28adbacf11c3694091ce549 /src/qml/jsruntime/qv4scopedvalue_p.h | |
parent | 34956bc234bf1b2ebcf224a256297293ba4276aa (diff) | |
parent | 3cd46501b2a663c7cb20cae21b4ed051f2ce4ac7 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/qml/jit/qv4targetplatform_p.h
src/quick/accessible/qaccessiblequickitem_p.h
Change-Id: Ic95075a5fad81ec997a61561bd65979dfa3b9d4d
Diffstat (limited to 'src/qml/jsruntime/qv4scopedvalue_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4scopedvalue_p.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h index 58797f5eda..a6f7f8e0e7 100644 --- a/src/qml/jsruntime/qv4scopedvalue_p.h +++ b/src/qml/jsruntime/qv4scopedvalue_p.h @@ -126,9 +126,6 @@ struct ScopedValue { ptr = scope.engine->jsStackTop++; ptr->setM(o); -#ifndef QV4_USE_64_BIT_VALUE_ENCODING - ptr->setTag(QV4::Value::Managed_Type); -#endif } ScopedValue(const Scope &scope, Managed *m) @@ -150,9 +147,6 @@ struct ScopedValue ScopedValue &operator=(Heap::Base *o) { ptr->setM(o); -#ifndef QV4_USE_64_BIT_VALUE_ENCODING - ptr->setTag(QV4::Value::Managed_Type); -#endif return *this; } @@ -192,18 +186,12 @@ struct Scoped inline void setPointer(const Managed *p) { ptr->setM(p ? p->m() : 0); -#ifndef QV4_USE_64_BIT_VALUE_ENCODING - ptr->setTag(QV4::Value::Managed_Type); -#endif } Scoped(const Scope &scope) { ptr = scope.engine->jsStackTop++; ptr->setM(0); -#ifndef QV4_USE_64_BIT_VALUE_ENCODING - ptr->setTag(QV4::Value::Managed_Type); -#endif } Scoped(const Scope &scope, const Value &v) @@ -345,14 +333,14 @@ struct ScopedCallData { inline Value &Value::operator =(const ScopedValue &v) { - _val = v.ptr->val(); + _val = v.ptr->rawValue(); return *this; } template<typename T> inline Value &Value::operator=(const Scoped<T> &t) { - _val = t.ptr->val(); + _val = t.ptr->rawValue(); return *this; } |