diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-30 02:59:43 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-09-30 03:38:12 +0000 |
| commit | e4134cfd8086a78c61a46fdfb908ade27c8d9840 (patch) | |
| tree | 9514153cd35f7335238b08586671445283abbef6 /src/qml/jsruntime/qv4scopedvalue_p.h | |
| parent | 0ca693407473eb9457cdf8f9d4be32c9d4968ced (diff) | |
| parent | 0bf14044178d7aa212ac7e28530f9077790a3df4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
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 a6f7f8e0e7..5bc17f741b 100644 --- a/src/qml/jsruntime/qv4scopedvalue_p.h +++ b/src/qml/jsruntime/qv4scopedvalue_p.h @@ -315,7 +315,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; } |