summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJedrzej Nowacki <jedrzej.nowacki@nokia.com>2009-08-10 12:31:18 (GMT)
committerJedrzej Nowacki <jedrzej.nowacki@nokia.com>2009-08-10 12:43:30 (GMT)
commit738c0e2bcd8ae3bbbd8b1c3a62201a818ae645ba (patch)
treecfde860e8d5445189b3de103a21e3c4b8649376c
parentb62ab93d001d2f3238e24faa133720cb877e3023 (diff)
parent1ab58329a91fcb781cbda496dc8d79a35ef98f7f (diff)
downloadQt-738c0e2bcd8ae3bbbd8b1c3a62201a818ae645ba.zip
Qt-738c0e2bcd8ae3bbbd8b1c3a62201a818ae645ba.tar.gz
Qt-738c0e2bcd8ae3bbbd8b1c3a62201a818ae645ba.tar.bz2
Merge branch 'qtscript-jsc-backend' of git@scm.dev.nokia.troll.no:qt/qt-webkit into qtscript-jsc-backend
-rw-r--r--tests/auto/qscriptengine/tst_qscriptengine.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index e9eeca2..538834b 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -855,6 +855,7 @@ void tst_QScriptEngine::newQMetaObject()
void tst_QScriptEngine::newActivationObject()
{
+ QSKIP("internal function not implemented in JSC-based back-end", SkipAll);
QScriptEngine eng;
QScriptValue act = eng.newActivationObject();
QEXPECT_FAIL("", "", Continue);