tst_QMetaType: remove defined() test
This was testing implementation details that aren't that important any more and are about to be removed. Change-Id: I222a463f7fff9ff2de2cfffd77d8cec77510a57e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
parent
438b2f2d60
commit
176baa955a
@ -358,28 +358,6 @@ void tst_QMetaType::registerGadget(const char *name, const QList<GadgetPropertyT
|
|||||||
s_managedTypes[gadgetTypeId] = qMakePair(dynamicGadgetProperties, std::shared_ptr<QMetaObject>{meta, [](QMetaObject *ptr){ ::free(ptr); }});
|
s_managedTypes[gadgetTypeId] = qMakePair(dynamicGadgetProperties, std::shared_ptr<QMetaObject>{meta, [](QMetaObject *ptr){ ::free(ptr); }});
|
||||||
}
|
}
|
||||||
|
|
||||||
void tst_QMetaType::defined()
|
|
||||||
{
|
|
||||||
QCOMPARE(int(QMetaTypeId2<QString>::Defined), 1);
|
|
||||||
QCOMPARE(int(QMetaTypeId2<Foo>::Defined), 0);
|
|
||||||
QCOMPARE(int(QMetaTypeId2<void*>::Defined), 1);
|
|
||||||
QCOMPARE(int(QMetaTypeId2<int*>::Defined), 0);
|
|
||||||
QCOMPARE(int(QMetaTypeId2<CustomQObject::CustomQEnum>::Defined), 1);
|
|
||||||
QCOMPARE(int(QMetaTypeId2<CustomGadget>::Defined), 1);
|
|
||||||
QCOMPARE(int(QMetaTypeId2<CustomGadget*>::Defined), 1);
|
|
||||||
QVERIFY(!QMetaTypeId2<GadgetDerived>::Defined);
|
|
||||||
QVERIFY(!QMetaTypeId2<GadgetDerived*>::Defined);
|
|
||||||
QVERIFY(int(QMetaTypeId2<CustomQObject*>::Defined));
|
|
||||||
QVERIFY(!QMetaTypeId2<CustomQObject>::Defined);
|
|
||||||
QVERIFY(!QMetaTypeId2<CustomNonQObject>::Defined);
|
|
||||||
QVERIFY(!QMetaTypeId2<CustomNonQObject*>::Defined);
|
|
||||||
QVERIFY(!QMetaTypeId2<CustomGadget_NonDefaultConstructible>::Defined);
|
|
||||||
|
|
||||||
// registered with Q_DECLARE_METATYPE
|
|
||||||
QVERIFY(QMetaTypeId2<GadgetDerivedAndTyped<int>>::Defined);
|
|
||||||
QVERIFY(QMetaTypeId2<GadgetDerivedAndTyped<int>*>::Defined);
|
|
||||||
}
|
|
||||||
|
|
||||||
struct Bar
|
struct Bar
|
||||||
{
|
{
|
||||||
Bar()
|
Bar()
|
||||||
|
@ -44,7 +44,6 @@ private:
|
|||||||
QList<QVariant> propList;
|
QList<QVariant> propList;
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void defined();
|
|
||||||
#if QT_CONFIG(thread)
|
#if QT_CONFIG(thread)
|
||||||
void threadSafety();
|
void threadSafety();
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user