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

Conflicts:
	src/corelib/kernel/qobject.cpp
	src/gui/painting/qpaintengine_raster.cpp

Change-Id: I74e1779832f43d033708dcfd6b666c7b4f0111fb

1 files changed, 72 insertions, 13 deletions

diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index b4140a58c3..accdb83608 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -8828,7 +8828,20 @@ QDataStream &operator>>(QDataStream &in, QString &str)
 
 /*!
     \typedef QStringRef::const_iterator
-    \internal
+    \since 5.4
+
+    This typedef provides an STL-style const iterator for QStringRef.
+
+    \sa QStringRef::const_reverse_iterator
+*/
+
+/*!
+    \typedef QStringRef::const_reverse_iterator
+    \since 5.7
+
+    This typedef provides an STL-style const reverse iterator for QStringRef.
+
+    \sa QStringRef::const_iterator
 */
 
 /*!
@@ -8952,39 +8965,85 @@ ownership of it, no memory is freed when instances are destroyed.
 */
 
 /*!
-    \fn const QChar *QStringRef::begin() const
-    \since 5.4
+    \fn const QChar *QStringRef::constData() const
 
     Same as unicode().
 */
 
 /*!
-    \fn const QChar *QStringRef::cbegin() const
+    \fn QStringRef::const_iterator QStringRef::begin() const
     \since 5.4
 
-    Same as unicode().
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first character in
+    the string.
+
+    \sa cbegin(), end(), rbegin(), rend()
 */
 
 /*!
-    \fn const QChar *QStringRef::end() const
+    \fn QStringRef::const_iterator QStringRef::cbegin() const
     \since 5.4
 
-    Returns a pointer to one character past the last one in this string.
-    (It is the same as \c {unicode() + size()}.)
+    Same as begin().
+
+    \sa begin(), cend(), rbegin(), rend()
 */
 
 /*!
-    \fn const QChar *QStringRef::cend() const
+    \fn QStringRef::const_iterator QStringRef::end() const
+    \since 5.4
+
+    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
+    character after the last character in the list.
+
+    \sa cbegin(), end(), rbegin(), rend()
+*/
+
+/*! \fn QStringRef::const_iterator QStringRef::cend() const
     \since 5.4
 
-    Returns a pointer to one character past the last one in this string.
-    (It is the same as \c {unicode() + size()}.)
+    Same as end().
+
+    \sa end(), cbegin(), rbegin(), rend()
 */
 
 /*!
-    \fn const QChar *QStringRef::constData() const
+    \fn QStringRef::const_reverse_iterator QStringRef::rbegin() const
+    \since 5.7
 
-    Same as unicode().
+    Returns a const \l{STL-style iterators}{STL-style} reverse iterator pointing to the first
+    character in the string, in reverse order.
+
+    \sa begin(), crbegin(), rend()
+*/
+
+/*!
+    \fn QStringRef::const_reverse_iterator QStringRef::crbegin() const
+    \since 5.7
+
+    Same as rbegin().
+
+    \sa begin(), rbegin(), rend()
+*/
+
+/*!
+    \fn QStringRef::const_reverse_iterator QStringRef::rend() const
+    \since 5.7
+
+    Returns a \l{STL-style iterators}{STL-style} reverse iterator pointing to one past
+    the last character in the string, in reverse order.
+
+    \sa end(), crend(), rbegin()
+*/
+
+
+/*!
+    \fn QStringRef::const_reverse_iterator QStringRef::crend() const
+    \since 5.7
+
+    Same as rend().
+
+    \sa end(), rend(), rbegin()
 */
 
 /*!