Remove use of deprecated QTypeInfo traits

Also adjust expected size of types due to changes in Qt6

Change-Id: I98e5c6c7710637fe5c239743f102f9951ac66914
Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>

11 files changed, 6 insertions, 51 deletions

diff --git a/tests/auto/contacts/qcontact/tst_qcontact.cpp b/tests/auto/contacts/qcontact/tst_qcontact.cpp
index 76e233b77..a4accd1ec 100644
--- a/tests/auto/contacts/qcontact/tst_qcontact.cpp
+++ b/tests/auto/contacts/qcontact/tst_qcontact.cpp
@@ -652,20 +652,14 @@ void tst_QContact::traits()
 {
     QCOMPARE(sizeof(QContact), sizeof(void *));
     QVERIFY(QTypeInfo<QContact>::isComplex);
-    QVERIFY(!QTypeInfo<QContact>::isStatic);
-    QVERIFY(!QTypeInfo<QContact>::isLarge);
     QVERIFY(!QTypeInfo<QContact>::isPointer);
-    QVERIFY(!QTypeInfo<QContact>::isDummy);
 }
 
 void tst_QContact::idTraits()
 {
-    QCOMPARE(sizeof(QContactId), 2*sizeof(void *));
+    QCOMPARE(sizeof(QContactId), 6*sizeof(void *));
     QVERIFY(QTypeInfo<QContactId>::isComplex);
-    QVERIFY(!QTypeInfo<QContactId>::isStatic);
-    QVERIFY(QTypeInfo<QContactId>::isLarge);
     QVERIFY(!QTypeInfo<QContactId>::isPointer);
-    QVERIFY(!QTypeInfo<QContactId>::isDummy);
 }
 
 void tst_QContact::equality()
diff --git a/tests/auto/contacts/qcontactactions/unittest/tst_qcontactactions.cpp b/tests/auto/contacts/qcontactactions/unittest/tst_qcontactactions.cpp
index 90828d5f5..5146e9c8d 100644
--- a/tests/auto/contacts/qcontactactions/unittest/tst_qcontactactions.cpp
+++ b/tests/auto/contacts/qcontactactions/unittest/tst_qcontactactions.cpp
@@ -392,10 +392,7 @@ void tst_QContactActions::traits()
     QCOMPARE(sizeof(QContactActionDescriptor), sizeof(void *));
     QTypeInfo<QTM_PREPEND_NAMESPACE(QContactActionDescriptor)> ti;
     QVERIFY(ti.isComplex);
-    QVERIFY(!ti.isStatic);
-    QVERIFY(!ti.isLarge);
     QVERIFY(!ti.isPointer);
-    QVERIFY(!ti.isDummy);
 }
 
 QTEST_MAIN(tst_QContactActions)
diff --git a/tests/auto/contacts/qcontactcollection/tst_qcontactcollection.cpp b/tests/auto/contacts/qcontactcollection/tst_qcontactcollection.cpp
index 5256196fd..9c758820a 100644
--- a/tests/auto/contacts/qcontactcollection/tst_qcontactcollection.cpp
+++ b/tests/auto/contacts/qcontactcollection/tst_qcontactcollection.cpp
@@ -364,20 +364,14 @@ void tst_QContactCollection::traits()
 {
     QCOMPARE(sizeof(QContactCollection), sizeof(void *));
     QVERIFY(QTypeInfo<QContactCollection>::isComplex);
-    QVERIFY(!QTypeInfo<QContactCollection>::isStatic);
-    QVERIFY(!QTypeInfo<QContactCollection>::isLarge);
     QVERIFY(!QTypeInfo<QContactCollection>::isPointer);
-    QVERIFY(!QTypeInfo<QContactCollection>::isDummy);
 }
 
 void tst_QContactCollection::idTraits()
 {
-    QCOMPARE(sizeof(QContactCollectionId), 2*sizeof(void *));
+    QCOMPARE(sizeof(QContactCollectionId), 6*sizeof(void *));
     QVERIFY(QTypeInfo<QContactCollectionId>::isComplex);
-    QVERIFY(!QTypeInfo<QContactCollectionId>::isStatic);
-    QVERIFY(QTypeInfo<QContactCollectionId>::isLarge);
     QVERIFY(!QTypeInfo<QContactCollectionId>::isPointer);
-    QVERIFY(!QTypeInfo<QContactCollectionId>::isDummy);
 }
 
 QTEST_MAIN(tst_QContactCollection)
diff --git a/tests/auto/contacts/qcontactdetail/tst_qcontactdetail.cpp b/tests/auto/contacts/qcontactdetail/tst_qcontactdetail.cpp
index c12e068ea..369fee03b 100644
--- a/tests/auto/contacts/qcontactdetail/tst_qcontactdetail.cpp
+++ b/tests/auto/contacts/qcontactdetail/tst_qcontactdetail.cpp
@@ -535,10 +535,7 @@ void tst_QContactDetail::traits()
 {
     QCOMPARE(sizeof(QContactDetail), sizeof(void *));
     QVERIFY(QTypeInfo<QContactDetail>::isComplex);
-    QVERIFY(!QTypeInfo<QContactDetail>::isStatic);
-    QVERIFY(!QTypeInfo<QContactDetail>::isLarge);
     QVERIFY(!QTypeInfo<QContactDetail>::isPointer);
-    QVERIFY(!QTypeInfo<QContactDetail>::isDummy);
 }
 
 void tst_QContactDetail::keys()
diff --git a/tests/auto/contacts/qcontactfilter/tst_qcontactfilter.cpp b/tests/auto/contacts/qcontactfilter/tst_qcontactfilter.cpp
index 2a655b62e..c6247d4df 100644
--- a/tests/auto/contacts/qcontactfilter/tst_qcontactfilter.cpp
+++ b/tests/auto/contacts/qcontactfilter/tst_qcontactfilter.cpp
@@ -1371,10 +1371,7 @@ void tst_QContactFilter::traits()
 {
     QCOMPARE(sizeof(QContactFilter), sizeof(void *));
     QVERIFY(QTypeInfo<QContactFilter>::isComplex);
-    QVERIFY(!QTypeInfo<QContactFilter>::isStatic);
-    QVERIFY(!QTypeInfo<QContactFilter>::isLarge);
     QVERIFY(!QTypeInfo<QContactFilter>::isPointer);
-    QVERIFY(!QTypeInfo<QContactFilter>::isDummy);
 
     QCOMPARE(sizeof(QContactDetailFilter), sizeof(void*));
     QCOMPARE(sizeof(QContactChangeLogFilter), sizeof(void*));
diff --git a/tests/auto/contacts/qcontactsortorder/tst_qcontactsortorder.cpp b/tests/auto/contacts/qcontactsortorder/tst_qcontactsortorder.cpp
index c7ca46830..e8a2bb6be 100644
--- a/tests/auto/contacts/qcontactsortorder/tst_qcontactsortorder.cpp
+++ b/tests/auto/contacts/qcontactsortorder/tst_qcontactsortorder.cpp
@@ -73,11 +73,8 @@ void tst_QContactSortOrder::traits()
 {
     QTypeInfo<QContactSortOrder> ti;
     QVERIFY(ti.isComplex);
-    QVERIFY(!ti.isStatic);
-    QVERIFY(!ti.isLarge);
     QVERIFY(!ti.isPointer);
-    QVERIFY(!ti.isDummy);
-    QCOMPARE(uint(ti.sizeOf), uint(sizeof(void *)));
+    QCOMPARE(sizeof(QContactSortOrder), sizeof(void *));
 }
 
 void tst_QContactSortOrder::sortObject()
diff --git a/tests/auto/organizer/qorganizercollection/tst_qorganizercollection.cpp b/tests/auto/organizer/qorganizercollection/tst_qorganizercollection.cpp
index ad0cb660d..eeb2da442 100644
--- a/tests/auto/organizer/qorganizercollection/tst_qorganizercollection.cpp
+++ b/tests/auto/organizer/qorganizercollection/tst_qorganizercollection.cpp
@@ -444,20 +444,14 @@ void tst_QOrganizerCollection::traits()
 {
     QCOMPARE(sizeof(QOrganizerCollection), sizeof(void *));
     QVERIFY(QTypeInfo<QOrganizerCollection>::isComplex);
-    QVERIFY(!QTypeInfo<QOrganizerCollection>::isStatic);
-    QVERIFY(!QTypeInfo<QOrganizerCollection>::isLarge);
     QVERIFY(!QTypeInfo<QOrganizerCollection>::isPointer);
-    QVERIFY(!QTypeInfo<QOrganizerCollection>::isDummy);
 }
 
 void tst_QOrganizerCollection::idTraits()
 {
-    QCOMPARE(sizeof(QOrganizerCollectionId), 2*sizeof(void *));
+    QCOMPARE(sizeof(QOrganizerCollectionId), 6*sizeof(void *));
     QVERIFY(QTypeInfo<QOrganizerCollectionId>::isComplex);
-    QVERIFY(!QTypeInfo<QOrganizerCollectionId>::isStatic);
-    QVERIFY(QTypeInfo<QOrganizerCollectionId>::isLarge);
     QVERIFY(!QTypeInfo<QOrganizerCollectionId>::isPointer);
-    QVERIFY(!QTypeInfo<QOrganizerCollectionId>::isDummy);
 }
 
 QTEST_MAIN(tst_QOrganizerCollection)
diff --git a/tests/auto/organizer/qorganizeritem/tst_qorganizeritem.cpp b/tests/auto/organizer/qorganizeritem/tst_qorganizeritem.cpp
index 24670a82e..eacdc8758 100644
--- a/tests/auto/organizer/qorganizeritem/tst_qorganizeritem.cpp
+++ b/tests/auto/organizer/qorganizeritem/tst_qorganizeritem.cpp
@@ -907,20 +907,14 @@ void tst_QOrganizerItem::traits()
 {
     QCOMPARE(sizeof(QOrganizerItem), sizeof(void *));
     QVERIFY(QTypeInfo<QOrganizerItem>::isComplex);
-    QVERIFY(!QTypeInfo<QOrganizerItem>::isStatic);
-    QVERIFY(!QTypeInfo<QOrganizerItem>::isLarge);
     QVERIFY(!QTypeInfo<QOrganizerItem>::isPointer);
-    QVERIFY(!QTypeInfo<QOrganizerItem>::isDummy);
 }
 
 void tst_QOrganizerItem::idTraits()
 {
-    QCOMPARE(sizeof(QOrganizerItemId), 2*sizeof(void *));
+    QCOMPARE(sizeof(QOrganizerItemId), 6*sizeof(void *));
     QVERIFY(QTypeInfo<QOrganizerItemId>::isComplex);
-    QVERIFY(!QTypeInfo<QOrganizerItemId>::isStatic);
-    QVERIFY(QTypeInfo<QOrganizerItemId>::isLarge);
     QVERIFY(!QTypeInfo<QOrganizerItemId>::isPointer);
-    QVERIFY(!QTypeInfo<QOrganizerItemId>::isDummy);
 }
 
 void tst_QOrganizerItem::event()
diff --git a/tests/auto/organizer/qorganizeritemdetail/tst_qorganizeritemdetail.cpp b/tests/auto/organizer/qorganizeritemdetail/tst_qorganizeritemdetail.cpp
index 6eda6fccf..3a050b34f 100644
--- a/tests/auto/organizer/qorganizeritemdetail/tst_qorganizeritemdetail.cpp
+++ b/tests/auto/organizer/qorganizeritemdetail/tst_qorganizeritemdetail.cpp
@@ -593,10 +593,7 @@ void tst_QOrganizerItemDetail::traits()
     QCOMPARE(sizeof(QOrganizerItemDetail), sizeof(void *));
     QTypeInfo<QOrganizerItemDetail> ti;
     QVERIFY(ti.isComplex);
-    QVERIFY(!ti.isStatic);
-    QVERIFY(!ti.isLarge);
     QVERIFY(!ti.isPointer);
-    QVERIFY(!ti.isDummy);
 }
 
 void tst_QOrganizerItemDetail::keys()
diff --git a/tests/auto/organizer/qorganizeritemfilter/tst_qorganizeritemfilter.cpp b/tests/auto/organizer/qorganizeritemfilter/tst_qorganizeritemfilter.cpp
index 7af4bf267..77f8787cf 100644
--- a/tests/auto/organizer/qorganizeritemfilter/tst_qorganizeritemfilter.cpp
+++ b/tests/auto/organizer/qorganizeritemfilter/tst_qorganizeritemfilter.cpp
@@ -1132,10 +1132,7 @@ void tst_QOrganizerItemFilter::traits()
     QCOMPARE(sizeof(QOrganizerItemFilter), sizeof(void *));
     QTypeInfo<QOrganizerItemFilter> ti;
     QVERIFY(ti.isComplex);
-    QVERIFY(!ti.isStatic);
-    QVERIFY(!ti.isLarge);
     QVERIFY(!ti.isPointer);
-    QVERIFY(!ti.isDummy);
 }
 
 void tst_QOrganizerItemFilter::testDebugStreamOut()
diff --git a/tests/auto/organizer/qorganizeritemsortorder/tst_qorganizeritemsortorder.cpp b/tests/auto/organizer/qorganizeritemsortorder/tst_qorganizeritemsortorder.cpp
index 33a954249..83b272245 100644
--- a/tests/auto/organizer/qorganizeritemsortorder/tst_qorganizeritemsortorder.cpp
+++ b/tests/auto/organizer/qorganizeritemsortorder/tst_qorganizeritemsortorder.cpp
@@ -73,11 +73,8 @@ void tst_QOrganizerItemSortOrder::traits()
 {
     QTypeInfo<QOrganizerItemSortOrder> ti;
     QVERIFY(ti.isComplex);
-    QVERIFY(!ti.isStatic);
-    QVERIFY(!ti.isLarge);
     QVERIFY(!ti.isPointer);
-    QVERIFY(!ti.isDummy);
-    QCOMPARE(uint(ti.sizeOf), uint(sizeof(void *)));
+    QCOMPARE(sizeof(QOrganizerItemSortOrder), sizeof(void *));
 }
 
 void tst_QOrganizerItemSortOrder::sortObject()