diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-06-19 13:28:26 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-06-25 07:36:48 +0000 |
| commit | 1596112e146b28541bcee412ed159cdea7e692d0 (patch) | |
| tree | 29e858041496256c9c9c700fca4fb7220d78d46e /tests/auto/qml/qjsvalue | |
| parent | 3823e9b94f849f8344b81250fac708ac2eaccd16 (diff) | |
Add Proxy support for prototype handling
Cleanup get/setPrototypeOf and fix some smaller incompatibilities
in the default implementation for Object.
Add the methods to the vtable and reimplement them according to
spec for ProxyObjects.
Clean up the Object.prototype.get/setPrototypeOf/__proto__ methods
and fix a smaller bug in the Reflect API for those methods.
Change-Id: I6e438753332ec4db963d6cdcf86f340ff212777a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/qjsvalue')
| -rw-r--r-- | tests/auto/qml/qjsvalue/tst_qjsvalue.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp index 6587408ae4..6384369ef0 100644 --- a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp +++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp @@ -1638,7 +1638,7 @@ void tst_QJSValue::getSetPrototype_evalCyclicPrototype() QJSEngine eng; QJSValue ret = eng.evaluate("o = { }; p = { }; o.__proto__ = p; p.__proto__ = o"); QCOMPARE(ret.isError(), true); - QCOMPARE(ret.toString(), QLatin1String("TypeError: Cyclic __proto__ value")); + QCOMPARE(ret.toString(), QLatin1String("TypeError: Could not change prototype.")); } void tst_QJSValue::getSetPrototype_eval() |