diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-24 16:38:26 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-31 14:32:45 (GMT) |
| commit | 6fcd431d04cf7416179d5ab30f656a6ce3926070 (patch) | |
| tree | dc0c234fb4b1dd75610a4a61661d1178fffe081c /tests/auto/declarative | |
| parent | a1a141e4af6226dca9ae67c51dd5e14cb3393772 (diff) | |
| download | Qt-6fcd431d04cf7416179d5ab30f656a6ce3926070.zip Qt-6fcd431d04cf7416179d5ab30f656a6ce3926070.tar.gz Qt-6fcd431d04cf7416179d5ab30f656a6ce3926070.tar.bz2 | |
Fix declarative after the last changes to the QObject internals
Diffstat (limited to 'tests/auto/declarative')
| -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 06baed8..1b9831c 100644 --- a/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp +++ b/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp @@ -140,9 +140,9 @@ void tst_QMetaObjectBuilder::mocVersionCheck() // whenenver moc changes. Once QMetaObjectBuilder has been // updated, this test can be changed to check for the next version. int version = int(QObject::staticMetaObject.d.data[0]); - QVERIFY(version == 4 || version == 5); + QVERIFY(version == 4 || version == 5 || version == 6); version = int(staticMetaObject.d.data[0]); - QVERIFY(version == 4 || version == 5); + QVERIFY(version == 4 || version == 5 || version == 6); } void tst_QMetaObjectBuilder::create() @@ -920,9 +920,9 @@ void tst_QMetaObjectBuilder::relatedMetaObject() QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::RelatedMetaObjects)); } -static int smetacall(QMetaObject::Call, int, void **) +static void smetacall(QObject *, QMetaObject::Call, int, void **) { - return 0; + return; } void tst_QMetaObjectBuilder::staticMetacall() |