Merge remote-tracking branch 'origin/5.14' into 5.15

Conflicts:
	.qmake.conf
	src/plugins/platforms/xcb/qxcbscreen.cpp
	src/widgets/accessible/qaccessiblewidget.cpp

Change-Id: Ib3138e61ba7981610940509a7ff02ba2dd281bf0

3 files changed, 21 insertions, 3 deletions

diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp
index 4d9a629ab6..ce2ceac938 100644
--- a/src/widgets/accessible/complexwidgets.cpp
+++ b/src/widgets/accessible/complexwidgets.cpp
@@ -108,7 +108,10 @@ public:
             s.invalid = true;
             return s;
         }
-        return parent()->state();
+
+        QAccessible::State s = parent()->state();
+        s.focused = (m_index == m_parent->currentIndex());
+        return s;
     }
     QRect rect() const override {
         if (!isValid())
@@ -216,6 +219,16 @@ QTabBar *QAccessibleTabBar::tabBar() const
     return qobject_cast<QTabBar*>(object());
 }
 
+QAccessibleInterface* QAccessibleTabBar::focusChild() const
+{
+    for (int i = 0; i < childCount(); ++i) {
+        if (child(i)->state().focused)
+            return child(i);
+    }
+
+    return nullptr;
+}
+
 QAccessibleInterface* QAccessibleTabBar::child(int index) const
 {
     if (QAccessible::Id id = m_childInterfaces.value(index))
diff --git a/src/widgets/accessible/complexwidgets_p.h b/src/widgets/accessible/complexwidgets_p.h
index e7a32c7264..335e257476 100644
--- a/src/widgets/accessible/complexwidgets_p.h
+++ b/src/widgets/accessible/complexwidgets_p.h
@@ -112,6 +112,7 @@ public:
     explicit QAccessibleTabBar(QWidget *w);
     ~QAccessibleTabBar();
 
+    QAccessibleInterface *focusChild() const override;
     int childCount() const override;
     QString text(QAccessible::Text t) const override;
 
diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp
index c782e00f4f..68ad855c7c 100644
--- a/src/widgets/accessible/qaccessiblewidget.cpp
+++ b/src/widgets/accessible/qaccessiblewidget.cpp
@@ -376,8 +376,12 @@ QAccessibleInterface *QAccessibleWidget::focusChild() const
     if (!fw)
         return nullptr;
 
-    if (isAncestor(widget(), fw) || fw == widget())
-        return QAccessible::queryAccessibleInterface(fw);
+    if (isAncestor(widget(), fw)) {
+        QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(fw);
+        if (!iface || iface == this || !iface->focusChild())
+            return iface;
+        return iface->focusChild();
+    }
     return nullptr;
 }