diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-20 17:46:46 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-11 08:40:35 +0100 |
| commit | 254cf16ed4c6007a59a7cd5d64bb621430b3c01d (patch) | |
| tree | 7330fcef5dbd63ba2809d4e8fd3449a673c327f9 /src/qml/jsruntime/qv4functionobject.cpp | |
| parent | 7cfc07ae1bf4ccbec109f52195ef824a3ea4dc21 (diff) | |
Fix Object::arrayData() accessor to return a heap object
Change-Id: Iffc82c2f415251d73bb7446848399b54b16589c9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4functionobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4functionobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index ea82923cc5..8833d675d5 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -326,11 +326,11 @@ ReturnedValue FunctionPrototype::method_apply(CallContext *ctx) for (quint32 i = 0; i < len; ++i) callData->args[i] = arr->getIndexed(i); } else { - uint alen = arr->arrayData() ? arr->arrayData()->length() : 0; + uint alen = arr->arrayData() ? arr->arrayData()->len : 0; if (alen > len) alen = len; for (uint i = 0; i < alen; ++i) - callData->args[i] = static_cast<SimpleArrayData *>(arr->arrayData())->data(i); + callData->args[i] = static_cast<Heap::SimpleArrayData *>(arr->arrayData())->data(i); for (quint32 i = alen; i < len; ++i) callData->args[i] = Primitive::undefinedValue(); } |