Cleanup QTypeInfo

Remove QTypeInfo::isStatic, as that's not used anymore in Qt 6.
Also remove sizeOf, it's unused, and we have QMetaType for that if
required.
Remove all typeinfo declaractions for trivial types, as the default
template covers them correctly nowadays.

Finally set up a better default for isPointer, and do some smaller
cleanups all over the place.

Change-Id: I6758ed37dfc701feaaf0ff105cc95e32da9f9c33
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

4 files changed, 25 insertions, 22 deletions

diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
index efec562ba9..0172927042 100644
--- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
+++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
@@ -800,9 +800,12 @@ void tst_QArrayData::arrayOps()
     };
     const CountedObject objArray[5];
 
-    QVERIFY(!QTypeInfo<int>::isComplex && !QTypeInfo<int>::isStatic);
-    QVERIFY(QTypeInfo<QString>::isComplex && !QTypeInfo<QString>::isStatic);
-    QVERIFY(QTypeInfo<CountedObject>::isComplex && QTypeInfo<CountedObject>::isStatic);
+    static_assert(!QTypeInfo<int>::isComplex);
+    static_assert(QTypeInfo<int>::isRelocatable);
+    static_assert(QTypeInfo<QString>::isComplex);
+    static_assert(QTypeInfo<QString>::isRelocatable);
+    static_assert(QTypeInfo<CountedObject>::isComplex);
+    static_assert(!QTypeInfo<CountedObject>::isRelocatable);
 
     QCOMPARE(CountedObject::liveCount, size_t(5));
     for (size_t i = 0; i < 5; ++i)
diff --git a/tests/auto/corelib/tools/qlist/tst_qlist.cpp b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
index 56651ae474..f37633b64c 100644
--- a/tests/auto/corelib/tools/qlist/tst_qlist.cpp
+++ b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
@@ -184,11 +184,11 @@ inline size_t qHash(const Custom &key, size_t seed = 0) { return qHash(key.i, se
 Q_DECLARE_METATYPE(Custom);
 
 // tests depends on the fact that:
-static_assert(!QTypeInfo<int>::isStatic);
+static_assert(QTypeInfo<int>::isRelocatable);
 static_assert(!QTypeInfo<int>::isComplex);
-static_assert(!QTypeInfo<Movable>::isStatic);
+static_assert(QTypeInfo<Movable>::isRelocatable);
 static_assert(QTypeInfo<Movable>::isComplex);
-static_assert(QTypeInfo<Custom>::isStatic);
+static_assert(!QTypeInfo<Custom>::isRelocatable);
 static_assert(QTypeInfo<Custom>::isComplex);
 
 
@@ -2144,7 +2144,7 @@ void tst_QList::resizePOD_data() const
     QTest::addColumn<int>("size");
 
     QVERIFY(!QTypeInfo<int>::isComplex);
-    QVERIFY(!QTypeInfo<int>::isStatic);
+    QVERIFY(QTypeInfo<int>::isRelocatable);
 
     QList<int> null;
     QList<int> empty(0, 5);
@@ -2192,7 +2192,7 @@ void tst_QList::resizeComplexMovable_data() const
     QTest::addColumn<int>("size");
 
     QVERIFY(QTypeInfo<Movable>::isComplex);
-    QVERIFY(!QTypeInfo<Movable>::isStatic);
+    QVERIFY(QTypeInfo<Movable>::isRelocatable);
 
     QList<Movable> null;
     QList<Movable> empty(0, 'Q');
@@ -2244,7 +2244,7 @@ void tst_QList::resizeComplex_data() const
     QTest::addColumn<int>("size");
 
     QVERIFY(QTypeInfo<Custom>::isComplex);
-    QVERIFY(QTypeInfo<Custom>::isStatic);
+    QVERIFY(!QTypeInfo<Custom>::isRelocatable);
 
     QList<Custom> null;
     QList<Custom> empty(0, '0');
diff --git a/tests/auto/corelib/tools/qpair/tst_qpair.cpp b/tests/auto/corelib/tools/qpair/tst_qpair.cpp
index 70caa055b6..70808e3e48 100644
--- a/tests/auto/corelib/tools/qpair/tst_qpair.cpp
+++ b/tests/auto/corelib/tools/qpair/tst_qpair.cpp
@@ -43,7 +43,7 @@ private Q_SLOTS:
     void testDeductionRules();
 };
 
-class C { C() {} Q_DECL_UNUSED_MEMBER char _[4]; };
+class C { C() {} ~C() {} Q_DECL_UNUSED_MEMBER char _[4]; };
 class M { M() {} Q_DECL_UNUSED_MEMBER char _[4]; };
 class P { Q_DECL_UNUSED_MEMBER char _[4]; };
 
@@ -64,31 +64,31 @@ typedef QPair<P,M> QPairPM;
 typedef QPair<P,P> QPairPP;
 
 static_assert( QTypeInfo<QPairCC>::isComplex);
-static_assert( QTypeInfo<QPairCC>::isStatic );
+static_assert( !QTypeInfo<QPairCC>::isRelocatable );
 
 static_assert( QTypeInfo<QPairCM>::isComplex);
-static_assert( QTypeInfo<QPairCM>::isStatic );
+static_assert( !QTypeInfo<QPairCM>::isRelocatable );
 
 static_assert( QTypeInfo<QPairCP>::isComplex);
-static_assert( QTypeInfo<QPairCP>::isStatic );
+static_assert( !QTypeInfo<QPairCP>::isRelocatable );
 
 static_assert( QTypeInfo<QPairMC>::isComplex);
-static_assert( QTypeInfo<QPairMC>::isStatic );
+static_assert( !QTypeInfo<QPairMC>::isRelocatable );
 
 static_assert( QTypeInfo<QPairMM>::isComplex);
-static_assert(!QTypeInfo<QPairMM>::isStatic );
+static_assert( QTypeInfo<QPairMM>::isRelocatable );
 
 static_assert( QTypeInfo<QPairMP>::isComplex);
-static_assert(!QTypeInfo<QPairMP>::isStatic );
+static_assert( QTypeInfo<QPairMP>::isRelocatable );
 
 static_assert( QTypeInfo<QPairPC>::isComplex);
-static_assert( QTypeInfo<QPairPC>::isStatic );
+static_assert( !QTypeInfo<QPairPC>::isRelocatable );
 
 static_assert( QTypeInfo<QPairPM>::isComplex);
-static_assert(!QTypeInfo<QPairPM>::isStatic );
+static_assert( QTypeInfo<QPairPM>::isRelocatable );
 
 static_assert(!QTypeInfo<QPairPP>::isComplex);
-static_assert(!QTypeInfo<QPairPP>::isStatic );
+static_assert( QTypeInfo<QPairPP>::isRelocatable );
 
 static_assert(!QTypeInfo<QPairPP>::isPointer);
 
diff --git a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
index 3a504177db..5c5ccf0a21 100644
--- a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
+++ b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
@@ -528,11 +528,11 @@ void reallocTest()
 
     typedef QVarLengthArray<T, 16> Container;
     enum {
-        isStatic = QTypeInfo<T>::isStatic,
+        isRelocatable = QTypeInfo<T>::isRelocatable,
         isComplex = QTypeInfo<T>::isComplex,
 
-        isPrimitive = !isComplex && !isStatic,
-        isMovable = !isStatic
+        isPrimitive = !isComplex && isRelocatable,
+        isMovable = isRelocatable
     };
 
     // Constructors