summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-05 15:29:18 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-05 15:29:18 (GMT)
commit43ab9a27363681c5db81004c95141b3d0695cabd (patch)
treede9997688b7c007e57001607d4623c328346e05f /tests/auto
parenta11921c7ae4428cfaa53356dbc0b3415a297e083 (diff)
downloadQt-43ab9a27363681c5db81004c95141b3d0695cabd.zip
Qt-43ab9a27363681c5db81004c95141b3d0695cabd.tar.gz
Qt-43ab9a27363681c5db81004c95141b3d0695cabd.tar.bz2
make QScriptEngine::newQMetaObject() work
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qscriptengine/tst_qscriptengine.cpp3
-rw-r--r--tests/auto/qscriptqobject/tst_qscriptqobject.cpp1
2 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 25e84dc..ec84406 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -832,7 +832,6 @@ void tst_QScriptEngine::newQMetaObject()
QScriptValue ret = qclass3.construct();
QVERIFY(ret.isObject());
QVERIFY(ret.property("isCalledAsConstructor").isBoolean());
- QEXPECT_FAIL("", "isCalledAsConstructor not yet implemented for script function", Continue);
QVERIFY(ret.property("isCalledAsConstructor").toBoolean());
QVERIFY(ret.instanceOf(qclass3));
}
@@ -843,8 +842,6 @@ void tst_QScriptEngine::newQMetaObject()
// with meta-constructor
QScriptValue qclass4 = eng.newQMetaObject(&QObject::staticMetaObject);
- QEXPECT_FAIL("", "Crashes!!!", Abort);
- QVERIFY(false);
{
QScriptValue inst = qclass4.construct();
QVERIFY(inst.isQObject());
diff --git a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
index d7eb137..3959023 100644
--- a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
+++ b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
@@ -2098,7 +2098,6 @@ public:
void tst_QScriptExtQObject::classConstructor()
{
- QSKIP("Crashes", SkipAll);
QScriptValue myClass = qScriptValueFromQMetaObject<MyQObject>(m_engine);
m_engine->globalObject().setProperty("MyQObject", myClass);