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

 Conflicts:
	src/corelib/text/qlocale.cpp
	src/network/access/qnetworkaccessmanager.cpp

Regenerated tests/auto/testlib/selftests/float/CMakeLists.txt

Change-Id: I5a8ae42511380ca49a38b13c6fa8a3c5df8bed01

1 files changed, 0 insertions, 32 deletions

diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
index 6eb84f6c99..f87cf41bf1 100644
--- a/src/corelib/text/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -1781,57 +1781,39 @@ const QString::Null QString::null = { };
 
 /*! \typedef QString::const_iterator
 
-    This typedef provides an STL-style const iterator for QString.
-
     \sa QString::iterator
 */
 
 /*! \typedef QString::iterator
 
-    The QString::iterator typedef provides an STL-style non-const
-    iterator for QString.
-
     \sa QString::const_iterator
 */
 
 /*! \typedef QString::const_reverse_iterator
     \since 5.6
 
-    This typedef provides an STL-style const reverse iterator for QString.
-
     \sa QString::reverse_iterator, QString::const_iterator
 */
 
 /*! \typedef QString::reverse_iterator
     \since 5.6
 
-    This typedef provides an STL-style non-const reverse iterator for QString.
-
     \sa QString::const_reverse_iterator, QString::iterator
 */
 
 /*!
     \typedef QString::size_type
-
-    The QString::size_type typedef provides an STL-style type for sizes (int).
 */
 
 /*!
     \typedef QString::difference_type
-
-    The QString::size_type typedef provides an STL-style type for difference between pointers.
 */
 
 /*!
     \typedef QString::const_reference
-
-    This typedef provides an STL-style const reference for a QString element (QChar).
 */
 /*!
     \typedef QString::reference
-
-    This typedef provides an STL-style
-    reference for a QString element (QChar).
 */
 
 /*!
@@ -1849,8 +1831,6 @@ const QString::Null QString::null = { };
 
 /*!
     \typedef QString::value_type
-
-    This typedef provides an STL-style value type for QString.
 */
 
 /*! \fn QString::iterator QString::begin()
@@ -9397,8 +9377,6 @@ QString &QString::setRawData(const QChar *unicode, int size)
     \typedef QLatin1String::iterator
     \since 5.10
 
-    This typedef provides an STL-style const iterator for QLatin1String.
-
     QLatin1String does not support mutable iterators, so this is the same
     as const_iterator.
 
@@ -9409,8 +9387,6 @@ QString &QString::setRawData(const QChar *unicode, int size)
     \typedef QLatin1String::const_iterator
     \since 5.10
 
-    This typedef provides an STL-style const iterator for QLatin1String.
-
     \sa iterator, const_reverse_iterator
 */
 
@@ -9418,8 +9394,6 @@ QString &QString::setRawData(const QChar *unicode, int size)
     \typedef QLatin1String::reverse_iterator
     \since 5.10
 
-    This typedef provides an STL-style const reverse iterator for QLatin1String.
-
     QLatin1String does not support mutable reverse iterators, so this is the
     same as const_reverse_iterator.
 
@@ -9430,8 +9404,6 @@ QString &QString::setRawData(const QChar *unicode, int size)
     \typedef QLatin1String::const_reverse_iterator
     \since 5.10
 
-    This typedef provides an STL-style const reverse iterator for QLatin1String.
-
     \sa reverse_iterator, const_iterator
 */
 
@@ -10332,8 +10304,6 @@ QDataStream &operator>>(QDataStream &in, QString &str)
     \typedef QStringRef::const_iterator
     \since 5.4
 
-    This typedef provides an STL-style const iterator for QStringRef.
-
     \sa QStringRef::const_reverse_iterator
 */
 
@@ -10341,8 +10311,6 @@ QDataStream &operator>>(QDataStream &in, QString &str)
     \typedef QStringRef::const_reverse_iterator
     \since 5.7
 
-    This typedef provides an STL-style const reverse iterator for QStringRef.
-
     \sa QStringRef::const_iterator
 */