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

Change-Id: I66c7f18a2abd13601da0947919436f7da3549ae9

1 files changed, 18 insertions, 4 deletions

diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiautils.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiautils.cpp
index 7a91c3d4e2..fbb5c3b9ec 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiautils.cpp
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiautils.cpp
@@ -57,11 +57,25 @@ QWindow *windowForAccessible(const QAccessibleInterface *accessible)
 {
     QWindow *window = accessible->window();
     if (!window) {
-        QAccessibleInterface *acc = accessible->parent();
-        while (acc && acc->isValid() && !window) {
-            window = acc->window();
-            QAccessibleInterface *par = acc->parent();
+        const QAccessibleInterface *acc = accessible;
+        const QAccessibleInterface *par = accessible->parent();
+        while (par && par->isValid() && !window) {
+            window = par->window();
             acc = par;
+            par = par->parent();
+        }
+        if (!window) {
+            // Workaround for WebEngineView not knowing its parent.
+            const auto appWindows = QGuiApplication::topLevelWindows();
+            for (QWindow *w : appWindows) {
+                if (QAccessibleInterface *root = w->accessibleRoot()) {
+                    int count = root->childCount();
+                    for (int i = 0; i < count; ++i) {
+                        if (root->child(i) == acc)
+                            return w;
+                    }
+                }
+            }
         }
     }
     return window;