diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-08-08 12:52:56 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-08 15:35:18 +0200 |
| commit | 0c179baade8f4a57c0f9fe7b48367412e8a41f2a (patch) | |
| tree | 30c775eda2fcba23827bdfc7f5d4c042813b8a2e /tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | |
| parent | 5046e8898803ab3e83f4dae1260345fdba207a32 (diff) | |
Fix hasOwnProperty on various types wrapped in QML
* Change semantics of Object::query to not walk the prototype chain but let the
caller do that where needed (__hasProperty__)
* Re-implement query in various places
* Implement method_hasOwnProperty to fall back to query() if getOwnProperty failed
* Fix missing prototype initialization in some qml wrappers, as well as missing base
class calls to ::get()
Change-Id: Ic2a702fd5ff3be2ff3c8317a8a24f99940a9594f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp')
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index 321aa47297..b06f006239 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -1710,7 +1710,6 @@ void tst_qqmlecmascript::objectHasOwnProperty() QVERIFY(object != 0); // test QObjects in QML - QEXPECT_FAIL("", "hasOwnProperty is currently not properly supported for dynamic objects that re-implement get()", Abort); QMetaObject::invokeMethod(object, "testHasOwnPropertySuccess"); QVERIFY(object->property("result").value<bool>() == true); QMetaObject::invokeMethod(object, "testHasOwnPropertyFailure"); |