diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-05-24 08:57:40 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-05-24 09:15:57 +0200 |
| commit | b254bbb82b7d1b42950c4267d8e618b570f88cc6 (patch) | |
| tree | c8f9fd1fcbd5c5d4a75ffea79ee623ce59e9ae9b /tests/auto/qml/qjsengine | |
| parent | 1b0e6861ba7af231c29ebba10c93976845f7f78d (diff) | |
| parent | 5b8a94eb8e5d4e3b79ab73a9a0325f838ecbe41a (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I0127f2c16de1d930bdd8cbccd42ec6785f31ab96
Diffstat (limited to 'tests/auto/qml/qjsengine')
| -rw-r--r-- | tests/auto/qml/qjsengine/tst_qjsengine.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index 911da1b20c..e4bf2ff1aa 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -215,6 +215,8 @@ private slots: void functionToString_data(); void functionToString(); + void protoChanges_QTBUG68369(); + signals: void testSignal(); }; @@ -4247,6 +4249,22 @@ void tst_QJSEngine::functionToString() QCOMPARE(evaluationResult.toString(), expectedString); } +void tst_QJSEngine::protoChanges_QTBUG68369() +{ + QJSEngine engine; + QJSValue ok = engine.evaluate( + "var o = { x: true };" + "var p1 = {};" + "var p2 = {};" + "o.__proto__ = p1;" + "o.__proto__ = p2;" + "o.__proto__ = p1;" + "p1.y = true;" + "o.y" + ); + QVERIFY(ok.toBool() == true); +} + QTEST_MAIN(tst_QJSEngine) #include "tst_qjsengine.moc" |