diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-05-14 02:01:04 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-17 23:59:03 +0200 |
| commit | bd7fb994da9dbb9340f6485376f0f187488a05a4 (patch) | |
| tree | c9f92ae7aaf346a8def41e1ff581f20e317eac08 /tests/auto/qml/qjsengine | |
| parent | 093c9c94189018381a0e155b0fa421cc73dbb704 (diff) | |
convert QV8VariantWrapper to v4
Implement variant support through a QV4::VariantObject
class. Port scarce resource support for the
pixmap and image variants.
Change-Id: Ib6aac8debc7f57224ccddb912ab4342c5f1dec15
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'tests/auto/qml/qjsengine')
| -rw-r--r-- | tests/auto/qml/qjsengine/tst_qjsengine.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index 9050fb90f5..62401b7363 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -259,7 +259,6 @@ void tst_QJSEngine::newVariant() QVERIFY(!opaque.isCallable()); QCOMPARE(opaque.isObject(), true); QVERIFY(!opaque.prototype().isUndefined()); - QEXPECT_FAIL("", "FIXME: newly created QObject's prototype is an JS Object", Continue); QCOMPARE(opaque.prototype().isVariant(), true); QVERIFY(opaque.property("valueOf").callWithInstance(opaque).equals(opaque)); } |