summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/kernel/qvariant
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-07-06 23:09:05 +0200
committerLars Knoll <lars.knoll@qt.io>2020-08-24 00:17:04 +0200
commit6d95ffe996288796d53b64702409bbfab29cea67 (patch)
tree4caa97ac58880beff7a317e5d9307ea6525b8678 /tests/auto/corelib/kernel/qvariant
parent804cb94da9a299118300c215a4d7445faa6236c3 (diff)
Cleanups in QSequentialIterable
Remove the old revision of the interface, this is not required with Qt 6 anymore, as everything is being recompiled anyway. Change-Id: I66070c4dc6b5e2a6d22f5a9ebea7688ed38333fe Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests/auto/corelib/kernel/qvariant')
-rw-r--r--tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index 02a537a9d6..af0d1e0cf1 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -4516,8 +4516,8 @@ void tst_QVariant::shouldDeleteVariantDataWorksForSequential()
iterator._size = [](const void *) {return 1;};
iterator._metaType_id = qMetaTypeId<MyType>();
- iterator._moveToBegin = [](const void *, void **) {};
- iterator._moveToEnd = [](const void *, void **) {};
+ iterator._moveTo = [](const void *, void **, QtMetaTypePrivate::QSequentialIterableImpl::Position) {};
+ iterator._append = [](const void *, const void *) {};
iterator._advance = [](void **, int) {};
iterator._destroyIter = [](void **){};
iterator._equalIter = [](void * const *, void * const *){return true; /*all iterators are nullptr*/};
@@ -4655,7 +4655,7 @@ void tst_QVariant::sequentialIterableEndianessSanityCheck()
namespace QMTP = QtMetaTypePrivate;
uint oldIteratorCaps = QMTP::ForwardCapability | QMTP::BiDirectionalCapability | QMTP::RandomAccessCapability;
QMTP::QSequentialIterableImpl seqImpl {};
- QCOMPARE(seqImpl.revision(), 1u);
+ QCOMPARE(seqImpl.revision(), 0u);
memcpy(&seqImpl._iteratorCapabilities, &oldIteratorCaps, sizeof(oldIteratorCaps));
QCOMPARE(seqImpl.revision(), 0u);
}