1 files changed, 29 insertions, 43 deletions

diff --git a/src/plugins/platforms/ios/qiosplatformaccessibility.mm b/src/plugins/platforms/ios/qiosplatformaccessibility.mm
index aef4216e03..eb18ee637e 100644
--- a/src/plugins/platforms/ios/qiosplatformaccessibility.mm
+++ b/src/plugins/platforms/ios/qiosplatformaccessibility.mm
@@ -1,48 +1,15 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
 
 #include "qiosplatformaccessibility.h"
 
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
 
 #include <QtGui/QtGui>
 #include "qioswindow.h"
+#include "quiaccessibilityelement.h"
 
 QIOSPlatformAccessibility::QIOSPlatformAccessibility()
 {}
@@ -61,8 +28,6 @@ void invalidateCache(QAccessibleInterface *iface)
     // This will invalidate everything regardless of what window the
     // interface belonged to. We might want to revisit this strategy later.
     // (Therefore this function still takes the interface as argument)
-    // It is also responsible for the bug that focus gets temporary lost
-    // when items get added or removed from the screen
     foreach (QWindow *win, QGuiApplication::topLevelWindows()) {
         if (win && win->handle()) {
             QT_PREPEND_NAMESPACE(QIOSWindow) *window = static_cast<QT_PREPEND_NAMESPACE(QIOSWindow) *>(win->handle());
@@ -74,14 +39,35 @@ void invalidateCache(QAccessibleInterface *iface)
 
 void QIOSPlatformAccessibility::notifyAccessibilityUpdate(QAccessibleEvent *event)
 {
-    if (!isActive() || !event->accessibleInterface())
+    auto *accessibleInterface = event->accessibleInterface();
+    if (!isActive() || !accessibleInterface)
         return;
     switch (event->type()) {
+    case QAccessible::Focus: {
+        auto *element = [QMacAccessibilityElement elementWithId:event->uniqueId()];
+        Q_ASSERT(element);
+        // There's no NSAccessibilityFocusedUIElementChangedNotification, like we have on
+        // macOS. Instead, the documentation for UIAccessibilityLayoutChangedNotification
+        // specifies that the optional argument to UIAccessibilityPostNotification is the
+        // accessibility element for VoiceOver to move to after processing the notification.
+        UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, element);
+        break;
+    }
     case QAccessible::ObjectCreated:
     case QAccessible::ObjectShow:
     case QAccessible::ObjectHide:
     case QAccessible::ObjectDestroyed:
-        invalidateCache(event->accessibleInterface());
+        invalidateCache(accessibleInterface);
+        switch (accessibleInterface->role()) {
+        case QAccessible::Window:
+        case QAccessible::Dialog:
+            // Bigger changes to the UI require a full reset of VoiceOver
+            UIAccessibilityPostNotification(UIAccessibilityScreenChangedNotification, nil);
+            break;
+        default:
+            // While smaller changes can be handled by re-reading the layout
+            UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, nil);
+        }
         break;
     default:
         break;