diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-09-16 15:39:10 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-17 14:05:01 +0200 |
commit | 2af188c6d06af7dffbcb7b15f96fe7e188558624 (patch) | |
tree | 3f0f6e6403d433dcfdcdbc9808e26624eca7b654 /tests/auto/corelib/kernel/qvariant | |
parent | bcb68461c9b0b3e074e63fe92458b650b1933ef0 (diff) |
MetaType: Fix operator{++,--}(int) with the type-erased const_iterators.
Similar to commit 8b062418 (MetaType: Fix operator{+,-}(int)
with the type-erased const_iterators., 2013-09-11), explicitly
create a copy of the iterator and intialise it.
Change-Id: I8b9edef40ca00c826f72768cba4a0992e55371f8
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'tests/auto/corelib/kernel/qvariant')
-rw-r--r-- | tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index 52319f47fd..a375ac1797 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -3831,6 +3831,19 @@ void tst_QVariant::iterateContainerElements() QCOMPARE(ints.at(i), *it); } } + { + QVariantList ints; + ints << 1 << 2 << 3; + QVariant var = QVariant::fromValue(ints); + QSequentialIterable iter = var.value<QSequentialIterable>(); + QSequentialIterable::const_iterator it = iter.begin(); + + QVariantList intsCopy; + intsCopy << *(it++); + intsCopy << *(it++); + intsCopy << *(it++); + QCOMPARE(ints, intsCopy); + } #define TEST_ASSOCIATIVE_ITERATION(CONTAINER, KEY_TYPE, MAPPED_TYPE) \ { \ @@ -3882,6 +3895,23 @@ void tst_QVariant::iterateContainerElements() QCOMPARE(*(mapping.begin() + i), (*it).toString()); } } + { + QVariantList nums; + nums << "one" << "two" << "three"; + QMap<int, QString> mapping; + mapping.insert(1, "one"); + mapping.insert(2, "two"); + mapping.insert(3, "three"); + QVariant var = QVariant::fromValue(mapping); + QAssociativeIterable iter = var.value<QAssociativeIterable>(); + QAssociativeIterable::const_iterator it = iter.begin(); + + QVariantList numsCopy; + numsCopy << *(it++); + numsCopy << *(it++); + numsCopy << *(it++); + QCOMPARE(nums, numsCopy); + } } void tst_QVariant::pairElements() |