diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-11-18 16:56:41 +0100 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-11-30 17:16:21 +0100 |
commit | 26e1a0997e1494433e43355cb56c05543ac56b5c (patch) | |
tree | 5b296c71e017edf0129805238bc026cfe0b84d1d /tests/auto/corelib | |
parent | 2cea05fce920d428dd05938620f16981ddc9176f (diff) |
QMetaObjectBuilder: remove relocatable data support
Change-Id: I6f1dc9e81723e9a8af8988a8cb45c63c05214296
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r-- | tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp index 21166533bf..3068fe60c5 100644 --- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp +++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp @@ -51,7 +51,6 @@ private slots: void staticMetacall(); void copyMetaObject(); void serialize(); - void relocatableData(); void removeNotifySignal(); void usage_signal(); @@ -1075,44 +1074,6 @@ void tst_QMetaObjectBuilder::serialize() } } -void tst_QMetaObjectBuilder::relocatableData() -{ - QMetaObjectBuilder builder; - builder.setClassName("TestObject"); - - QMetaMethodBuilder intPropChanged = builder.addSignal("intPropChanged(int)"); - intPropChanged.setParameterNames(QList<QByteArray>() << "newIntPropValue"); - - QMetaPropertyBuilder prop = builder.addProperty("intProp", "int"); - prop.setNotifySignal(intPropChanged); - - QMetaMethodBuilder voidSlotInt = builder.addSlot("voidSlotInt(int)"); - voidSlotInt.setParameterNames(QList<QByteArray>() << "slotIntArg"); - - QMetaMethodBuilder listInvokableQRealQString = builder.addMethod("listInvokableQRealQString(qreal,QString)"); - listInvokableQRealQString.setReturnType("QVariantList"); - listInvokableQRealQString.setParameterNames(QList<QByteArray>() << "qrealArg" << "qstringArg"); - - bool ok = false; - QByteArray data = builder.toRelocatableData(&ok); - QVERIFY(ok); - - QMetaObjectBuilder builder2; - QMetaObject meta2; - builder2.fromRelocatableData(&meta2, &QObject::staticMetaObject, data); - - QMetaObject *meta = builder.toMetaObject(); - - auto compared = sameMetaObject(meta, &meta2); - dynamicMetaObjectsPendingFree.push_back(meta); - QVERIFY2(compared, qPrintable(compared.details)); - - QVERIFY(!meta2.d.extradata); - QVERIFY(!meta2.d.relatedMetaObjects); - QVERIFY(!meta2.d.static_metacall); -} - - // Check that removing a method updates notify signals appropriately void tst_QMetaObjectBuilder::removeNotifySignal() { |