summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-07-02 13:07:01 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-07-02 13:07:01 (GMT)
commit0357533025a7e4066def7665f3c77337f1ab21db (patch)
treea6aee166be2f9642035cba038c7adcb9e9c5aab2 /tests
parent5d3ae53770a0b6ba0ad8c3271f6fcda72179c68e (diff)
downloadQt-0357533025a7e4066def7665f3c77337f1ab21db.zip
Qt-0357533025a7e4066def7665f3c77337f1ab21db.tar.gz
Qt-0357533025a7e4066def7665f3c77337f1ab21db.tar.bz2
implement string-->enum conversion
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qscriptqobject/tst_qscriptqobject.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
index 89dbd3d..f471edb 100644
--- a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
+++ b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
@@ -807,11 +807,9 @@ void tst_QScriptExtQObject::getSetStaticProperty()
m_engine->evaluate("myObject.enumProperty = 2");
QCOMPARE(m_myObject->enumProperty(), MyQObject::BazPolicy);
m_engine->evaluate("myObject.enumProperty = 'BarPolicy'");
- QEXPECT_FAIL("", "Doesn't work yet", Continue);
QCOMPARE(m_myObject->enumProperty(), MyQObject::BarPolicy);
m_engine->evaluate("myObject.enumProperty = 'ScoobyDoo'");
// ### ouch! Shouldn't QMetaProperty::write() rather not change the value...?
- QEXPECT_FAIL("", "Doesn't work yet", Continue);
QCOMPARE(m_myObject->enumProperty(), (MyQObject::Policy)-1);
// enum property with custom conversion
qScriptRegisterMetaType<MyQObject::Policy>(m_engine, policyToScriptValue, policyFromScriptValue);