Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/network/access/qhttpthreaddelegate.cpp

Change-Id: Ia15372687c93cd585967b006c0baaac3a5f29e91

1 files changed, 5 insertions, 5 deletions

diff --git a/tests/auto/corelib/tools/qarraydata/simplevector.h b/tests/auto/corelib/tools/qarraydata/simplevector.h
index ea3892ec5c..40917c0172 100644
--- a/tests/auto/corelib/tools/qarraydata/simplevector.h
+++ b/tests/auto/corelib/tools/qarraydata/simplevector.h
@@ -269,9 +269,9 @@ public:
         if (first == last)
             return;
 
-        T *const begin = d->begin();
-        T *const where = begin + position;
-        const T *const end = begin + d->size;
+        const iterator begin = d->begin();
+        const iterator where = begin + position;
+        const iterator end = begin + d->size;
         if (d.needsDetach()
                 || capacity() - size() < size_t(last - first)) {
             SimpleVector detached(Data::allocate(
@@ -290,8 +290,8 @@ public:
         if ((first >= where && first < end)
                 || (last > where && last <= end)) {
             // Copy overlapping data first and only then shuffle it into place
-            T *start = d->begin() + position;
-            T *middle = d->end();
+            iterator start = d->begin() + position;
+            iterator middle = d->end();
 
             d->copyAppend(first, last);
             std::rotate(start, middle, d->end());