diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-10 14:49:25 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-10-10 14:49:25 +0000 |
| commit | 8fe6b4d3ef03955c23a1d8816d4c947efbde381b (patch) | |
| tree | bb077d2bfa9c2d922eb83cb386859162aa3a63c1 /src/qml/jsruntime/qv4scopedvalue_p.h | |
| parent | bae22adafc3a6f5ff7f920e71c1542dc25cf1bab (diff) | |
| parent | 102fa9b6db82ecd2b95d168912fde0c8bc3798b3 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/qml/jsruntime/qv4scopedvalue_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4scopedvalue_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h index 44d171e087..5022d7c3bc 100644 --- a/src/qml/jsruntime/qv4scopedvalue_p.h +++ b/src/qml/jsruntime/qv4scopedvalue_p.h @@ -324,7 +324,7 @@ struct ScopedCallData { { int size = qMax(argc, (int)QV4::Global::ReservedArgumentCount) + qOffsetOf(QV4::CallData, args)/sizeof(QV4::Value); ptr = reinterpret_cast<CallData *>(scope.alloc(size)); - ptr->tag = QV4::Value::Integer_Type; + ptr->tag = QV4::Value::Integer_Type_Internal; ptr->argc = argc; } |