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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/auto/qml/ecmascripttests/TestExpectations | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/qml/ecmascripttests/TestExpectations b/tests/auto/qml/ecmascripttests/TestExpectations index 4204cbf877..144690f5f2 100644 --- a/tests/auto/qml/ecmascripttests/TestExpectations +++ b/tests/auto/qml/ecmascripttests/TestExpectations @@ -852,7 +852,6 @@ built-ins/Proxy/set/trap-is-undefined-receiver.js fails built-ins/Proxy/setPrototypeOf/trap-is-not-callable-realm.js fails built-ins/Reflect/construct/newtarget-is-not-constructor-throws.js fails built-ins/Reflect/construct/return-with-newtarget-argument.js fails -built-ins/Reflect/get/return-value-from-receiver.js fails built-ins/Reflect/ownKeys/return-on-corresponding-order.js fails built-ins/Reflect/set/creates-a-data-descriptor.js fails built-ins/Reflect/set/different-property-descriptors.js fails diff --git a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp index 5999bc42e9..990e364c76 100644 --- a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp +++ b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp @@ -803,7 +803,7 @@ void tst_qqmlcontext::contextLeak() { QV4::Scope scope(ddata->jsWrapper.engine()); QV4::ScopedValue scriptContextWrapper(scope); - scriptContextWrapper = context->importedScripts.valueRef()->as<QV4::Object>()->getIndexed(0); + scriptContextWrapper = context->importedScripts.valueRef()->as<QV4::Object>()->get(uint(0)); scriptContext = scriptContextWrapper->as<QV4::QQmlContextWrapper>()->getContext(); } } diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index 2e8f61ef10..69b62c733c 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -4152,7 +4152,7 @@ void tst_qqmlecmascript::verifyContextLifetime(QQmlContextData *ctxt) { QV4::Scoped<QV4::QQmlContextWrapper> qml(scope); for (quint32 i = 0; i < scripts->getLength(); ++i) { QQmlContextData *scriptContext, *newContext; - qml = scripts->getIndexed(i); + qml = scripts->get(i); scriptContext = qml ? qml->getContext() : nullptr; qml = QV4::Encode::undefined(); @@ -4164,7 +4164,7 @@ void tst_qqmlecmascript::verifyContextLifetime(QQmlContextData *ctxt) { } ctxt->engine->collectGarbage(); - qml = scripts->getIndexed(i); + qml = scripts->get(i); newContext = qml ? qml->getContext() : nullptr; QCOMPARE(scriptContext, newContext); } |