1 files changed, 49 insertions, 48 deletions

diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.cpp
index a93a05c7bc..95bc2f7570 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.cpp
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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) 2017 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
 
 #include <QtGui/qtguiglobal.h>
 #if QT_CONFIG(accessibility)
@@ -72,12 +36,20 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaSelectionItemProvider::Select()
     if (!accessible)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
+    if (QAccessibleInterface *parent = accessible->parent()) {
+        if (QAccessibleSelectionInterface *selectionInterface = parent->selectionInterface()) {
+            selectionInterface->clear();
+            bool ok = selectionInterface->select(accessible);
+            return ok ? S_OK : S_FALSE;
+        }
+    }
+
     QAccessibleActionInterface *actionInterface = accessible->actionInterface();
     if (!actionInterface)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
-    if (accessible->role() == QAccessible::RadioButton) {
-        // For radio buttons we just invoke the selection action; others are automatically deselected.
+    if (accessible->role() == QAccessible::RadioButton || accessible->role() == QAccessible::PageTab) {
+        // For radio buttons/tabs we just invoke the selection action; others are automatically deselected.
         actionInterface->doAction(QAccessibleActionInterface::pressAction());
     } else {
         // Toggle list item if not already selected. It must be done first to support all selection modes.
@@ -109,12 +81,19 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaSelectionItemProvider::AddToSelection()
     if (!accessible)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
+    if (QAccessibleInterface *parent = accessible->parent()) {
+        if (QAccessibleSelectionInterface *selectionInterface = parent->selectionInterface()) {
+            bool ok = selectionInterface->select(accessible);
+            return ok ? S_OK : S_FALSE;
+        }
+    }
+
     QAccessibleActionInterface *actionInterface = accessible->actionInterface();
     if (!actionInterface)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
-    if (accessible->role() == QAccessible::RadioButton) {
-        // For radio buttons we invoke the selection action.
+    if (accessible->role() == QAccessible::RadioButton || accessible->role() == QAccessible::PageTab) {
+        // For radio buttons and tabs we invoke the selection action.
         actionInterface->doAction(QAccessibleActionInterface::pressAction());
     } else {
         // Toggle list item if not already selected.
@@ -134,11 +113,18 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaSelectionItemProvider::RemoveFromSelection(
     if (!accessible)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
+    if (QAccessibleInterface *parent = accessible->parent()) {
+        if (QAccessibleSelectionInterface *selectionInterface = parent->selectionInterface()) {
+            bool ok = selectionInterface->unselect(accessible);
+            return ok ? S_OK : S_FALSE;
+        }
+    }
+
     QAccessibleActionInterface *actionInterface = accessible->actionInterface();
     if (!actionInterface)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
-    if (accessible->role() != QAccessible::RadioButton) {
+    if (accessible->role() != QAccessible::RadioButton && accessible->role() != QAccessible::PageTab) {
         if (accessible->state().selected) {
             actionInterface->doAction(QAccessibleActionInterface::toggleAction());
         }
@@ -160,8 +146,18 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaSelectionItemProvider::get_IsSelected(BOOL
     if (!accessible)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
+    if (QAccessibleInterface *parent = accessible->parent()) {
+        if (QAccessibleSelectionInterface *selectionInterface = parent->selectionInterface()) {
+            bool selected = selectionInterface->isSelected(accessible);
+            *pRetVal = selected ? TRUE : FALSE;
+            return S_OK;
+        }
+    }
+
     if (accessible->role() == QAccessible::RadioButton)
         *pRetVal = accessible->state().checked;
+    else if (accessible->role() == QAccessible::PageTab)
+        *pRetVal = accessible->state().focused;
     else
         *pRetVal = accessible->state().selected;
     return S_OK;
@@ -180,16 +176,21 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaSelectionItemProvider::get_SelectionContain
     if (!accessible)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
+    QAccessibleInterface *parent = accessible->parent();
+    if (parent && parent->selectionInterface()) {
+        *pRetVal = QWindowsUiaMainProvider::providerForAccessible(parent);
+        return S_OK;
+    }
+
     QAccessibleActionInterface *actionInterface = accessible->actionInterface();
     if (!actionInterface)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
     // Radio buttons do not require a container.
-    if (accessible->role() == QAccessible::ListItem) {
-        if (QAccessibleInterface *parent = accessible->parent()) {
-            if (parent->role() == QAccessible::List) {
-                *pRetVal = QWindowsUiaMainProvider::providerForAccessible(parent);
-            }
+    if (parent) {
+        if ((accessible->role() == QAccessible::ListItem && parent->role() == QAccessible::List)
+                || (accessible->role() == QAccessible::PageTab && parent->role() == QAccessible::PageTabList)) {
+            *pRetVal = QWindowsUiaMainProvider::providerForAccessible(parent);
         }
     }
     return S_OK;