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

 Conflicts:
	src/corelib/io/qdir.cpp
	src/corelib/kernel/qtimer.cpp
	src/corelib/kernel/qtimer.h

Done-With: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: I683d897760ec06593136d77955f8bc87fdef3f9f

6 files changed, 33 insertions, 14 deletions

diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp
index d7844f3128..5f7275c5f8 100644
--- a/src/corelib/tools/qmap.cpp
+++ b/src/corelib/tools/qmap.cpp
@@ -537,7 +537,7 @@ void QMapDataBase::freeData(QMapDataBase *d)
     \sa operator=()
 */
 
-/*! \fn template <class Key, class T> QMap<Key, T>::QMap(const std::map<Key, T> & other)
+/*! \fn template <class Key, class T> QMap<Key, T>::QMap(const typename std::map<Key, T> & other)
 
     Constructs a copy of \a other.
 
diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
index fec5f620fc..908e7ff0d6 100644
--- a/src/corelib/tools/qregularexpression.cpp
+++ b/src/corelib/tools/qregularexpression.cpp
@@ -2000,8 +2000,8 @@ QString QRegularExpression::wildcardToRegularExpression(const QString &pattern)
 
     \since 5.12
 
-    Returns the expression wrapped between the \c{\A} and \c{\z} anchors to be
-    used for exact matching.
+    Returns the \a expression wrapped between the \c{\A} and \c{\z} anchors to
+    be used for exact matching.
 
     \sa {Porting from QRegExp's Exact Matching}
 */
diff --git a/src/corelib/tools/qscopeguard.qdoc b/src/corelib/tools/qscopeguard.qdoc
index 7cbc3e9c7b..70e13ab2fd 100644
--- a/src/corelib/tools/qscopeguard.qdoc
+++ b/src/corelib/tools/qscopeguard.qdoc
@@ -30,24 +30,36 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \fn const QScopeGuard<F> qScopeGuard(F f)
-    \inmodule QtCore
-    \brief The qScopeGuard function can be used to call a function at the end of the scope.
+    \class QScopeGuard
     \since 5.12
+    \inmodule QtCore
+    \brief Provides a scope guard for calling a function at the of
+           a scope.
+*/
+
+/*!
+    \fn template <typename F> const QScopeGuard<F> qScopeGuard(F f)
+    \inmodule QtCore
+    \relates QScopeGuard
+    \brief The qScopeGuard function can be used to call a function at the end
+           of the scope.
     \ingroup misc
 
-    QScopeGuard<F> is a class which sole purpose is to run a function F in its destructor.
-    This is useful for guaranteeing your cleanup code is executed whether the function is exited normally,
-    exited early by a return statement, or exited by an exception.
+    QScopeGuard<F> is a class which sole purpose is to run a function \e F in
+    its destructor. This is useful for guaranteeing your cleanup code is
+    executed, whether the function is exited normally, exited early by a return
+    statement, or exited by an exception.
 
-    If F is a lambda then you cannot instantiate the template directly, therefore the qScopeGuard() helper
-    is provided and QScopeGuard<F> is made a private implementation detail.
+    If \e F is a lambda then you cannot instantiate the template directly,
+    therefore the qScopeGuard() helper is provided and QScopeGuard<F> is made a
+    private implementation detail.
 
     Example usage is as follows:
 
     \snippet code/src_corelib_tools_qscopeguard.cpp 0
 
-    \note Exceptions are not supported. The callable shouldn't throw when executed, copied or moved.
+    \note Exceptions are not supported. The callable shouldn't throw when
+          executed, copied or moved.
 
     \sa QScopedValueRollback
 */
diff --git a/src/corelib/tools/qshareddata.cpp b/src/corelib/tools/qshareddata.cpp
index bc4291e20f..c334f71fa0 100644
--- a/src/corelib/tools/qshareddata.cpp
+++ b/src/corelib/tools/qshareddata.cpp
@@ -579,6 +579,13 @@ QT_BEGIN_NAMESPACE
     the shared data object if the reference count became 0.
  */
 
+/*! \fn template <class T> T *QExplicitlySharedDataPointer<T>::take()
+    \since 5.12
+
+    Returns a pointer to the shared object, and resets \e this to be null.
+    That is, this function sets the \e{d pointer} of \e this to \c nullptr.
+ */
+
 /*! \fn template <class T> QExplicitlySharedDataPointer<T>::operator bool () const
     Returns \c true if the \e{d pointer} of \e this is \e not null.
  */
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 560453de84..90713bab10 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -254,7 +254,7 @@ inline RetType UnrollTailLoop<0>::exec(Number, RetType returnIfExited, Functor1,
 /*!
  * \internal
  *
- * Searches for character \a \c in the string \a str and returns a pointer to
+ * Searches for character \a c in the string \a str and returns a pointer to
  * it. Unlike strchr() and wcschr() (but like glibc's strchrnul()), if the
  * character is not found, this function returns a pointer to the end of the
  * string -- that is, \c{str.end()}.
diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp
index db6be581ec..cbc6b50c98 100644
--- a/src/corelib/tools/qtimezone.cpp
+++ b/src/corelib/tools/qtimezone.cpp
@@ -217,7 +217,7 @@ Q_GLOBAL_STATIC(QTimeZoneSingleton, global_tz);
 
     This class includes data obtained from the CLDR data files under the terms
     of the Unicode Data Files and Software License. See
-    \l{Unicode CLDR (Unicode Common Locale Data Repository)} for the details.
+    \l{Unicode Common Locale Data Repository (CLDR)} for details.
 
     \sa QDateTime
 */