diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-06-22 22:59:43 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-07-02 19:29:29 +0000 |
| commit | db695c5b1d07275f208446dad178b1131b20bb0a (patch) | |
| tree | c2175a065f4918d31249ca1ce46a2811733b8093 /src/qml/jsruntime/qv4arraydata.cpp | |
| parent | 98263a01373f5b225d64da216537165ae27d7ff1 (diff) | |
Unify the get and getIndexed vtable functions of QV4::Object
This finalizes the refactoring of Object's vtable API. Also added
the receiver argument to the method as required by the ES7 spec.
Change-Id: I36f9989211c47458788fe9f7e929862bcfe7b845
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4arraydata.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4arraydata.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4arraydata.cpp b/src/qml/jsruntime/qv4arraydata.cpp index ecc0b138c0..74ff1e2fc3 100644 --- a/src/qml/jsruntime/qv4arraydata.cpp +++ b/src/qml/jsruntime/qv4arraydata.cpp @@ -585,7 +585,7 @@ uint ArrayData::append(Object *obj, ArrayObject *otherObj, uint n) if (!other || ArgumentsObject::isNonStrictArgumentsObject(otherObj)) { ScopedValue v(scope); for (uint i = 0; i < n; ++i) - obj->arraySet(oldSize + i, (v = otherObj->getIndexed(i))); + obj->arraySet(oldSize + i, (v = otherObj->get(i))); } else if (other && other->isSparse()) { Heap::SparseArrayData *os = static_cast<Heap::SparseArrayData *>(other->d()); if (other->hasAttributes()) { |