diff options
| -rw-r--r-- | tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp index 3ecb890da9..91ef5fd2d6 100644 --- a/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp +++ b/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp @@ -79,6 +79,10 @@ private: QMetaObjectBuilder::AddMembers members); static bool sameMetaObject (const QMetaObject *meta1, const QMetaObject *meta2); + +#ifdef Q_NO_DATA_RELOCATION + const QMetaObject &tst_QMetaObjectBuilder::getStaticl(); +#endif }; // Dummy class that has something of every type of thing moc can generate. @@ -911,11 +915,19 @@ void tst_QMetaObjectBuilder::classInfo() QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::ClassInfos)); } +//#ifdef Q_NO_DATA_RELOCATION +//const QMetaObject &getStatic(){ return QObject::staticMetaObject; } +//const QMetaObject &tst_QMetaObjectBuilder::getStaticl(){ return staticMetaObject; } +//#endif + void tst_QMetaObjectBuilder::relatedMetaObject() { QMetaObjectBuilder builder; // Add two related meta objects and check their attributes. +#ifdef Q_NO_DATA_RELOCATION + QSKIP("No Data reloaction enabled, and QMetaObjectAccessor makes this hard, FIX ME", SkipSingle); +#else QCOMPARE(builder.addRelatedMetaObject(&QObject::staticMetaObject), 0); QCOMPARE(builder.addRelatedMetaObject(&staticMetaObject), 1); QVERIFY(builder.relatedMetaObject(0) == &QObject::staticMetaObject); @@ -929,6 +941,7 @@ void tst_QMetaObjectBuilder::relatedMetaObject() // Check that nothing else changed. QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::RelatedMetaObjects)); +#endif } static int smetacall(QMetaObject::Call, int, void **) @@ -1246,8 +1259,13 @@ bool tst_QMetaObjectBuilder::sameMetaObject return false; } +#ifdef Q_NO_DATA_RELOCATION + const QMetaObjectAccessor *objects1 = 0; + const QMetaObjectAccessor *objects2 = 0; +#else const QMetaObject **objects1 = 0; const QMetaObject **objects2 = 0; +#endif if (meta1->d.data[0] == meta2->d.data[0] && meta1->d.data[0] >= 2) { QMetaObjectExtraData *extra1 = (QMetaObjectExtraData *)(meta1->d.extradata); QMetaObjectExtraData *extra2 = (QMetaObjectExtraData *)(meta2->d.extradata); @@ -1257,13 +1275,18 @@ bool tst_QMetaObjectBuilder::sameMetaObject return false; if (extra1 && extra2) { if (extra1->static_metacall != extra2->static_metacall) - return false; + return false; objects1 = extra1->objects; objects2 = extra1->objects; } } else if (meta1->d.data[0] == meta2->d.data[0] && meta1->d.data[0] == 1) { +#ifdef Q_NO_DATA_RELOCATION + objects1 = (const QMetaObjectAccessor *)(meta1->d.extradata); + objects2 = (const QMetaObjectAccessor *)(meta2->d.extradata); +#else objects1 = (const QMetaObject **)(meta1->d.extradata); objects2 = (const QMetaObject **)(meta2->d.extradata); +#endif } if (objects1 && !objects2) return false; |