diff options
| author | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2009-09-30 08:44:53 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2009-09-30 08:44:53 (GMT) |
| commit | f4c2e64e4700c54750a82bf5a2d6c575afb1cde6 (patch) | |
| tree | 471860d7f5f1312ce02f1e671bab10871217b1c1 /tests/auto/qscriptvalue/tst_qscriptvalue.cpp | |
| parent | 6889622da4d17e5cd97e483deb780d83e3bb4548 (diff) | |
| parent | b35bbc064b967c6ec5522fe4e2e76522e92a0a96 (diff) | |
| download | Qt-f4c2e64e4700c54750a82bf5a2d6c575afb1cde6.zip Qt-f4c2e64e4700c54750a82bf5a2d6c575afb1cde6.tar.gz Qt-f4c2e64e4700c54750a82bf5a2d6c575afb1cde6.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qscriptvalue/tst_qscriptvalue.cpp')
| -rw-r--r-- | tests/auto/qscriptvalue/tst_qscriptvalue.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp index 6792ebf..6b64e76 100644 --- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp +++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp @@ -51,6 +51,10 @@ //TESTED_CLASS= //TESTED_FILES= +QT_BEGIN_NAMESPACE +extern bool qt_script_isJITEnabled(); +QT_END_NAMESPACE + class tst_QScriptValue : public QObject { Q_OBJECT @@ -2886,7 +2890,6 @@ void tst_QScriptValue::equals() { QScriptValue ret = compareFun.call(QScriptValue(), QScriptValueList() << qobj1 << qobj2); QVERIFY(ret.isBool()); - QEXPECT_FAIL("", "In JSC back-end, == on QObject wrappers doesn't work", Continue); QVERIFY(ret.toBool()); ret = compareFun.call(QScriptValue(), QScriptValueList() << qobj1 << qobj3); QVERIFY(ret.isBool()); @@ -2906,7 +2909,6 @@ void tst_QScriptValue::equals() { QScriptValue ret = compareFun.call(QScriptValue(), QScriptValueList() << var1 << var2); QVERIFY(ret.isBool()); - QEXPECT_FAIL("", "In JSC back-end, == on QVariant wrappers doesn't work", Continue); QVERIFY(ret.toBool()); } } |