From 2af188c6d06af7dffbcb7b15f96fe7e188558624 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Mon, 16 Sep 2013 15:39:10 +0200
Subject: MetaType: Fix operator{++,--}(int) with the type-erased
 const_iterators.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 .../auto/corelib/kernel/qvariant/tst_qvariant.cpp  | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp')

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()
-- 
cgit v1.2.3