diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-22 04:48:47 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-22 04:48:47 (GMT) |
| commit | 42de973ff156383beed62a6b1bce70b56b360078 (patch) | |
| tree | db12135e95c73018e28f24f02cf2224a0163fb2b /tests | |
| parent | 563cd3b737d8ccfa02db536debd077b8b92e9aa4 (diff) | |
| download | Qt-42de973ff156383beed62a6b1bce70b56b360078.zip Qt-42de973ff156383beed62a6b1bce70b56b360078.tar.gz Qt-42de973ff156383beed62a6b1bce70b56b360078.tar.bz2 | |
Update metaobjectbuilder version test.
Task-number: QT-2918
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp index c1dc924..8ba9d45 100644 --- a/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp +++ b/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp @@ -139,10 +139,10 @@ void tst_QMetaObjectBuilder::mocVersionCheck() // It is intended as a reminder to also update QMetaObjectBuilder // whenenver moc changes. Once QMetaObjectBuilder has been // updated, this test can be changed to check for the next version. - QEXPECT_FAIL("", "QT-2918", Continue); - QCOMPARE(int(QObject::staticMetaObject.d.data[0]), 4); - QEXPECT_FAIL("", "QT-2918", Continue); - QCOMPARE(int(staticMetaObject.d.data[0]), 4); + int version = int(QObject::staticMetaObject.d.data[0]); + QVERIFY(version == 4 || version == 5); + version = int(staticMetaObject.d.data[0]); + QVERIFY(version == 4 || version == 5); } void tst_QMetaObjectBuilder::create() |