diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-01-11 06:37:24 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-01-11 06:37:24 (GMT) |
| commit | 2be7112e69849bd0b4117ee2b6ea0789fa7bb3f0 (patch) | |
| tree | 692a4069e4664f9e0842a366025dbff50585fc42 /tests/auto | |
| parent | 7ff5100e6e56e1c0fe1aa6f1f0e20d16fdd789f2 (diff) | |
| parent | 2ec9b259f63a7305cf221425049cd728adb84bf2 (diff) | |
| download | Qt-2be7112e69849bd0b4117ee2b6ea0789fa7bb3f0.zip Qt-2be7112e69849bd0b4117ee2b6ea0789fa7bb3f0.tar.gz Qt-2be7112e69849bd0b4117ee2b6ea0789fa7bb3f0.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp index a153296..3aa1aff 100644 --- a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp +++ b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp @@ -216,6 +216,13 @@ void tst_qmlecmascript::methods() QCOMPARE(object->property("test2").toInt(), 17); QCOMPARE(object->property("test3").toInt(), 16); } + + { + QmlComponent component(&engine, TEST_FILE("methods.5.qml")); + QObject *object = component.create(); + QVERIFY(object != 0); + QCOMPARE(object->property("test").toInt(), 9); + } } void tst_qmlecmascript::bindingLoop() @@ -1051,6 +1058,7 @@ void tst_qmlecmascript::compositePropertyType() delete object; } +// QTBUG-6781 void tst_qmlecmascript::bug1() { QmlComponent component(&engine, TEST_FILE("bug.1.qml")); @@ -1065,7 +1073,6 @@ void tst_qmlecmascript::bug1() object->setProperty("b", true); - QEXPECT_FAIL("", "QTBUG-6781", Continue); QCOMPARE(object->property("test").toInt(), 9); delete object; |