Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into refs/staging/5.12

7 files changed, 30 insertions, 32 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()
 */
 /*!
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index d8b4c8cc97..6b59b0723b 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -2347,7 +2347,7 @@ bool QSortFilterProxyModel::insertRows(int row, int count, const QModelIndex &pa
     if (row > m->source_rows.count())
         return false;
     int source_row = (row >= m->source_rows.count()
-                      ? m->source_rows.count()
+                      ? m->proxy_rows.count()
                       : m->source_rows.at(row));
     return d->model->insertRows(source_row, count, source_parent);
 }
@@ -2367,7 +2367,7 @@ bool QSortFilterProxyModel::insertColumns(int column, int count, const QModelInd
     if (column > m->source_columns.count())
         return false;
     int source_column = (column >= m->source_columns.count()
-                         ? m->source_columns.count()
+                         ? m->proxy_columns.count()
                          : m->source_columns.at(column));
     return d->model->insertColumns(source_column, count, source_parent);
 }
diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h
index a6bd7847a5..b74b1fd123 100644
--- a/src/corelib/tools/qvarlengtharray.h
+++ b/src/corelib/tools/qvarlengtharray.h
@@ -490,7 +490,7 @@ Q_OUTOFLINE_TEMPLATE typename QVarLengthArray<T, Prealloc>::iterator QVarLengthA
         }
     } else {
         T *b = ptr + offset;
-        memmove(b + 1, b, (s - offset) * sizeof(T));
+        memmove(static_cast<void *>(b + 1), static_cast<const void *>(b), (s - offset) * sizeof(T));
         new (b) T(std::move(t));
     }
     s += 1;
@@ -518,7 +518,7 @@ Q_OUTOFLINE_TEMPLATE typename QVarLengthArray<T, Prealloc>::iterator QVarLengthA
         } else {
             T *b = ptr + offset;
             T *i = b + n;
-            memmove(i, b, (s - offset - n) * sizeof(T));
+            memmove(static_cast<void *>(i), static_cast<const void *>(b), (s - offset - n) * sizeof(T));
             while (i != b)
                 new (--i) T(copy);
         }
@@ -544,7 +544,7 @@ Q_OUTOFLINE_TEMPLATE typename QVarLengthArray<T, Prealloc>::iterator QVarLengthA
             i->~T();
         }
     } else {
-        memmove(ptr + f, ptr + l, (s - l) * sizeof(T));
+        memmove(static_cast<void *>(ptr + f), static_cast<const void *>(ptr + l), (s - l) * sizeof(T));
     }
     s -= n;
     return ptr + f;
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index f5527354a2..6f8ea6dc70 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -4163,7 +4163,7 @@ QDebug operator<<(QDebug dbg, const QEvent *e)
         const QNativeGestureEvent *ne = static_cast<const QNativeGestureEvent *>(e);
         dbg << "QNativeGestureEvent(";
         QtDebugUtils::formatQEnum(dbg, ne->gestureType());
-        dbg << "localPos=";
+        dbg << ", localPos=";
         QtDebugUtils::formatQPoint(dbg, ne->localPos());
         dbg << ", value=" << ne->value() << ')';
     }
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 6826f62b61..4e9b00f9c9 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -1043,19 +1043,31 @@ struct QBidiAlgorithm {
         }
     }
 
-    bool process()
+    bool checkForBidi() const
     {
-        memset(analysis, 0, length * sizeof(QScriptAnalysis));
-
-        bool hasBidi = (baseLevel != 0);
-        if (!hasBidi) {
-            for (int i = 0; i < length; ++i) {
-                if (text[i].unicode() >= 0x590) {
-                    hasBidi = true;
+        if (baseLevel != 0)
+            return true;
+        for (int i = 0; i < length; ++i) {
+            if (text[i].unicode() >= 0x590) {
+                switch (text[i].direction()) {
+                case QChar::DirR: case QChar::DirAN:
+                case QChar::DirLRE: case QChar::DirLRO: case QChar::DirAL:
+                case QChar::DirRLE: case QChar::DirRLO: case QChar::DirPDF:
+                case QChar::DirLRI: case QChar::DirRLI: case QChar::DirFSI: case QChar::DirPDI:
+                    return true;
+                default:
                     break;
                 }
             }
         }
+        return false;
+    }
+
+    bool process()
+    {
+        memset(analysis, 0, length * sizeof(QScriptAnalysis));
+
+        bool hasBidi = checkForBidi();
 
         if (!hasBidi)
             return false;
@@ -2071,7 +2083,6 @@ void QTextEngine::itemize() const
         case QChar::Nbsp:
             if (option.flags() & QTextOption::ShowTabsAndSpaces) {
                 analysis->flags = (*uc == QChar::Space) ? QScriptAnalysis::Space : QScriptAnalysis::Nbsp;
-                analysis->bidiLevel = bidi.baseLevel;
                 break;
             }
             Q_FALLTHROUGH();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiautils.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiautils.cpp
index 11397fb9ec..7a91c3d4e2 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiautils.cpp
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiautils.cpp
@@ -180,7 +180,7 @@ long roleToControlTypeId(QAccessible::Role role)
         {QAccessible::PropertyPage, UIA_CustomControlTypeId},
         {QAccessible::Indicator, UIA_CustomControlTypeId},
         {QAccessible::Graphic, UIA_ImageControlTypeId},
-        {QAccessible::StaticText, UIA_EditControlTypeId},
+        {QAccessible::StaticText, UIA_TextControlTypeId},
         {QAccessible::EditableText, UIA_EditControlTypeId},
         {QAccessible::Button, UIA_ButtonControlTypeId},
         {QAccessible::CheckBox, UIA_CheckBoxControlTypeId},
diff --git a/src/testlib/3rdparty/qt_attribution.json b/src/testlib/3rdparty/qt_attribution.json
index 47625634e5..18522b6cd8 100644
--- a/src/testlib/3rdparty/qt_attribution.json
+++ b/src/testlib/3rdparty/qt_attribution.json
@@ -8,6 +8,7 @@
 
         "Description": "An instrumentation framework for building dynamic analysis tools.",
         "Homepage": "http://valgrind.org/",
+        "Version": "3.3.0",
         "License": "BSD 4-clause \"Original\" or \"Old\" License",
         "LicenseId": "BSD-4-Clause",
         "LicenseFile": "VALGRIND_LICENSE.txt",
@@ -36,6 +37,8 @@ Copyright (c) 2003, 2006 Massachusetts Institute of Technology"
         "Files": "linux_perf_event_p.h",
 
         "Description": "Allows access to the Linux kernel's performance events.",
+        "Homepage": "https://www.kernel.org",
+        "Version": "3.7",
         "License": "GNU General Public License v2.0 only with Linux Syscall Note",
         "LicenseId": "GPL-2.0 WITH Linux-syscall-note",
         "LicenseFile": "LINUX_LICENSE.txt",