diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-08-20 18:31:06 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-26 01:03:22 +0200 |
| commit | acbf9a858b6b389103b7f43f4f4892a142ec56c6 (patch) | |
| tree | 1c5e7feae0cd6999e37fca0644d152c76d29a790 /tests/auto/corelib/tools/qlist/tst_qlist.cpp | |
| parent | db21bad936a761f475145886f1e06dfcfa11eb80 (diff) | |
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>
Diffstat (limited to 'tests/auto/corelib/tools/qlist/tst_qlist.cpp')
| -rw-r--r-- | tests/auto/corelib/tools/qlist/tst_qlist.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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'); |