diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-08 19:26:48 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-08 19:26:48 +0100 |
| commit | ff18885e0a7f7527eb96a9f2047507e7f418db45 (patch) | |
| tree | 37bd1970c31447c73862b81eae4429c7366ef1c7 /src/qml/jsruntime/qv4arrayobject.cpp | |
| parent | 439f31f128e70ecae16544ee7041695c60e0b2d6 (diff) | |
| parent | 40722a7eaf6bb6d77d730dc3f8510718e2cad549 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
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(); |