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

 Conflicts:
	src/gui/text/qtextengine.cpp
	tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
	tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h

Change-Id: Ib9f968edbb0f3387c89bc25e914321d0738bfadc

1 files changed, 0 insertions, 16 deletions

diff --git a/src/corelib/io/qloggingcategory.cpp b/src/corelib/io/qloggingcategory.cpp
index d8402c4eb6..aa84f56368 100644
--- a/src/corelib/io/qloggingcategory.cpp
+++ b/src/corelib/io/qloggingcategory.cpp
@@ -471,8 +471,6 @@ void QLoggingCategory::setFilterRules(const QString &rules)
     \note Arguments are not processed if debug output for the category is not
     enabled, so do not rely on any side effects.
 
-    \note Using the macro is thread-safe.
-
     \sa qDebug()
 */
 
@@ -493,8 +491,6 @@ void QLoggingCategory::setFilterRules(const QString &rules)
     \note Arguments might not be processed if debug output for the category is
     not enabled, so do not rely on any side effects.
 
-    \note Using the macro is thread-safe.
-
     \sa qDebug()
 */
 
@@ -518,8 +514,6 @@ void QLoggingCategory::setFilterRules(const QString &rules)
     \note Arguments are not processed if debug output for the category is not
     enabled, so do not rely on any side effects.
 
-    \note Using the macro is thread-safe.
-
     \sa qInfo()
 */
 
@@ -540,8 +534,6 @@ void QLoggingCategory::setFilterRules(const QString &rules)
     \note Arguments might not be processed if debug output for the category is
     not enabled, so do not rely on any side effects.
 
-    \note Using the macro is thread-safe.
-
     \sa qInfo()
 */
 
@@ -565,8 +557,6 @@ void QLoggingCategory::setFilterRules(const QString &rules)
     \note Arguments are not processed if warning output for the category is not
     enabled, so do not rely on any side effects.
 
-    \note Using the macro is thread-safe.
-
     \sa qWarning()
 */
 
@@ -587,8 +577,6 @@ void QLoggingCategory::setFilterRules(const QString &rules)
     \note Arguments might not be processed if warning output for the category is
     not enabled, so do not rely on any side effects.
 
-    \note Using the macro is thread-safe.
-
     \sa qWarning()
 */
 
@@ -612,8 +600,6 @@ void QLoggingCategory::setFilterRules(const QString &rules)
     \note Arguments are not processed if critical output for the category is not
     enabled, so do not rely on any side effects.
 
-    \note Using the macro is thread-safe.
-
     \sa qCritical()
 */
 
@@ -634,8 +620,6 @@ void QLoggingCategory::setFilterRules(const QString &rules)
     \note Arguments might not be processed if critical output for the category
     is not enabled, so do not rely on any side effects.
 
-    \note Using the macro is thread-safe.
-
     \sa qCritical()
 */
 /*!