diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-07-16 09:46:36 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-07-16 09:46:36 (GMT) |
| commit | 1d56e14605d74aefb955bdd81ee4083131252c9e (patch) | |
| tree | 56b4f308f98cfb90aead974a92d5be423e0ab360 /tests | |
| parent | f76a2fa667e19f2a42b2b22ea893a9d29dd74028 (diff) | |
| download | Qt-1d56e14605d74aefb955bdd81ee4083131252c9e.zip Qt-1d56e14605d74aefb955bdd81ee4083131252c9e.tar.gz Qt-1d56e14605d74aefb955bdd81ee4083131252c9e.tar.bz2 | |
only set default prototype if resulting object has built-in Object prototype as its prototype
port of commit 4182e9c4b2cbfcd0604c57da210e97d68cbbbb52 in qt/master.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qscriptqobject/tst_qscriptqobject.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp index 8aea80a..8a041d5 100644 --- a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp +++ b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp @@ -1422,7 +1422,6 @@ void tst_QScriptExtQObject::callQtInvokable() QScriptValue ret = m_engine->evaluate("myObject.myInvokableReturningMyQObjectAsQObject()"); QCOMPARE(m_myObject->qtFunctionInvoked(), 57); QVERIFY(ret.isQObject()); - QEXPECT_FAIL("", "Doesn't work", Continue); QVERIFY(ret.prototype().strictlyEquals(myQObjectProto)); qScriptRegisterMetaType<QObject*>(m_engine, 0, 0, QScriptValue()); |