From 98263a01373f5b225d64da216537165ae27d7ff1 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 22 Jun 2018 15:34:57 +0200 Subject: Unify put and putIndexed Pass an Identifier through those virtual methods to unify the string and integer based versions. Also add the receiver that's required in ES7 Change-Id: I4e7f01b4c97cc80bcb3c485f6343f28213dc9e6b Reviewed-by: Simon Hausmann --- src/qml/jsapi/qjsvalue.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/qml/jsapi/qjsvalue.cpp') diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index aa88530fe4..73e6243520 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -1209,10 +1209,8 @@ void QJSValue::setProperty(quint32 arrayIndex, const QJSValue& value) } QV4::ScopedValue v(scope, QJSValuePrivate::convertedToValue(engine, value)); - if (arrayIndex != UINT_MAX) - o->putIndexed(arrayIndex, v); - else - o->put(engine->id_uintMax(), v); + Identifier id = arrayIndex != UINT_MAX ? Identifier::fromArrayIndex(arrayIndex) : engine->id_uintMax()->identifier(); + o->put(id, v); if (engine->hasException) engine->catchException(); } -- cgit v1.2.3