Merge remote-tracking branch 'origin/5.8' into 5.9

Conflicts:
	configure.json
	mkspecs/win32-icc/qmake.conf

Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f

3 files changed, 13 insertions, 8 deletions

diff --git a/src/plugins/platforms/android/qandroideventdispatcher.cpp b/src/plugins/platforms/android/qandroideventdispatcher.cpp
index 104e905b8f..e12551283f 100644
--- a/src/plugins/platforms/android/qandroideventdispatcher.cpp
+++ b/src/plugins/platforms/android/qandroideventdispatcher.cpp
@@ -108,10 +108,9 @@ QAndroidEventDispatcherStopper *QAndroidEventDispatcherStopper::instance()
 void QAndroidEventDispatcherStopper::startAll()
 {
     QMutexLocker lock(&m_mutex);
-    if (started)
+    if (!m_started.testAndSetOrdered(0, 1))
         return;
 
-    started = true;
     for (QAndroidEventDispatcher *d : qAsConst(m_dispatchers))
         d->start();
 }
@@ -119,10 +118,9 @@ void QAndroidEventDispatcherStopper::startAll()
 void QAndroidEventDispatcherStopper::stopAll()
 {
     QMutexLocker lock(&m_mutex);
-    if (!started)
+    if (!m_started.testAndSetOrdered(1, 0))
         return;
 
-    started = false;
     for (QAndroidEventDispatcher *d : qAsConst(m_dispatchers))
         d->stop();
 }
diff --git a/src/plugins/platforms/android/qandroideventdispatcher.h b/src/plugins/platforms/android/qandroideventdispatcher.h
index 057a1660c9..e6f903bced 100644
--- a/src/plugins/platforms/android/qandroideventdispatcher.h
+++ b/src/plugins/platforms/android/qandroideventdispatcher.h
@@ -68,7 +68,7 @@ class QAndroidEventDispatcherStopper
 {
 public:
     static QAndroidEventDispatcherStopper *instance();
-    static bool stopped() {return !instance()->started; }
+    static bool stopped() {return !instance()->m_started.load(); }
     void startAll();
     void stopAll();
     void addEventDispatcher(QAndroidEventDispatcher *dispatcher);
@@ -77,7 +77,7 @@ public:
 
 private:
     QMutex m_mutex;
-    bool started = true;
+    QAtomicInt m_started = 1;
     QVector<QAndroidEventDispatcher *> m_dispatchers;
 };
 
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
index e743dd56bf..6001a845e8 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
@@ -235,9 +235,16 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of
     if (!iface || !iface->isValid())
         return nil;
 
+    // macOS expects that the hierarchy is:
+    // App -> Window -> Children
+    // We don't actually have the window reflected properly in QAccessibility.
+    // Check if the parent is the application and then instead return the native window.
+
     if (QAccessibleInterface *parent = iface->parent()) {
-        QAccessible::Id parentId = QAccessible::uniqueId(parent);
-        return [QMacAccessibilityElement elementWithId: parentId];
+        if (parent->role() != QAccessible::Application) {
+            QAccessible::Id parentId = QAccessible::uniqueId(parent);
+            return [QMacAccessibilityElement elementWithId: parentId];
+        }
     }
 
     if (QWindow *window = iface->window()) {