Merge master into api_changes

Conflicts:
	src/corelib/tools/qvector.h
	tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp

Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6

1 files changed, 19 insertions, 1 deletions

diff --git a/tests/auto/other/collections/tst_collections.cpp b/tests/auto/other/collections/tst_collections.cpp
index dc6d7f4b55..973938594f 100644
--- a/tests/auto/other/collections/tst_collections.cpp
+++ b/tests/auto/other/collections/tst_collections.cpp
@@ -550,6 +550,10 @@ void tst_Collections::list()
         QList<QString>::const_iterator cit = list.constBegin();
         QVERIFY((*cit).toLower() == "xello");
         QVERIFY(cit->toUpper() == "XELLO");
+
+        cit = list.cbegin();
+        QVERIFY((*cit).toLower() == "xello");
+        QVERIFY(cit->toUpper() == "XELLO");
     }
 
     {
@@ -967,6 +971,10 @@ void tst_Collections::linkedList()
         QLinkedList<QString>::const_iterator cit = list.constBegin();
         QVERIFY((*cit).toLower() == "xello");
         QVERIFY(cit->toUpper() == "XELLO");
+
+        cit = list.cbegin();
+        QVERIFY((*cit).toLower() == "xello");
+        QVERIFY(cit->toUpper() == "XELLO");
     }
 
     {
@@ -1607,6 +1615,10 @@ void tst_Collections::hash()
         QHash<int, QString>::const_iterator cit = hash.constBegin();
         QVERIFY((*cit).toLower() == "xello");
         QVERIFY(cit->toUpper() == "XELLO");
+
+        cit = hash.cbegin();
+        QVERIFY((*cit).toLower() == "xello");
+        QVERIFY(cit->toUpper() == "XELLO");
     }
 
     {
@@ -1924,6 +1936,10 @@ void tst_Collections::map()
         QMap<int, QString>::const_iterator cit = map.constBegin();
         QVERIFY((*cit).toLower() == "xello");
         QVERIFY(cit->toUpper() == "XELLO");
+
+        cit = map.cbegin();
+        QVERIFY((*cit).toLower() == "xello");
+        QVERIFY(cit->toUpper() == "XELLO");
     }
 
     {
@@ -2902,7 +2918,7 @@ void tst_Collections::linkedlist_stl()
     QCOMPARE(int(stdList.size()), elements.size());
 
     std::list<QString>::const_iterator it = stdList.begin();
-    QLinkedList<QString>::const_iterator it2 = list.constBegin();
+    QLinkedList<QString>::const_iterator it2 = list.cbegin();
     for (uint j = 0; j < stdList.size(); ++j, ++it, ++it2)
         QCOMPARE(*it, *it2);
 
@@ -3001,9 +3017,11 @@ void instantiateContainer()
 #ifndef QT_NO_STL
     typename ContainerType::const_iterator constIt;
     constIt = constContainer.begin();
+    constIt = container.cbegin();
     container.constBegin();
 
     constIt = constContainer.end();
+    constIt = constContainer.cend();
     container.constEnd();
     Q_UNUSED(constIt)
 #endif