diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-08 18:18:04 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-08 18:18:53 +0100 |
| commit | 40722a7eaf6bb6d77d730dc3f8510718e2cad549 (patch) | |
| tree | 1c3dec7b83ebd2bef910075889dc2c39697933ea /src/qml/jsruntime/qv4arrayobject.cpp | |
| parent | a9bef84675f6b67bb88a2bb99e45aba889795251 (diff) | |
| parent | 2f9099443d9acd6583e92785afbb38b2e4dcbfd5 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ied8d65aaf57e897a3dbc4df100744a594e8ee2cf
Diffstat (limited to 'src/qml/jsruntime/qv4arrayobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4arrayobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp index 9c7cb43351..0fc7f2ddb9 100644 --- a/src/qml/jsruntime/qv4arrayobject.cpp +++ b/src/qml/jsruntime/qv4arrayobject.cpp @@ -276,7 +276,7 @@ ReturnedValue ArrayPrototype::method_pop(CallContext *ctx) if (scope.hasException()) return Encode::undefined(); if (instance->isArrayObject()) - instance->setArrayLengthUnchecked(len - 1); + instance->setArrayLength(len - 1); else instance->put(ctx->engine->id_length, ScopedValue(scope, Primitive::fromDouble(len - 1))); return result.asReturnedValue(); |