From 761df2ced0081905b4238c66783bb276f504cf3d Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 13 Jun 2019 11:56:45 +0200 Subject: Accessibility: Switch should have checkbox as role Fixes: QTBUG-76356 Change-Id: I8f8e8331adbe741be2c893f2140d793d1b901434 Reviewed-by: Mitch Curtis --- src/quicktemplates2/qquickabstractbutton.cpp | 4 ++++ tests/auto/accessibility/tst_accessibility.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp index a2992191..0aa8ec28 100644 --- a/src/quicktemplates2/qquickabstractbutton.cpp +++ b/src/quicktemplates2/qquickabstractbutton.cpp @@ -1157,6 +1157,10 @@ void QQuickAbstractButton::accessibilityActiveChanged(bool active) QAccessible::Role QQuickAbstractButton::accessibleRole() const { + Q_D(const QQuickAbstractButton); + if (d->checkable) { + return QAccessible::CheckBox; + } return QAccessible::Button; } #endif diff --git a/tests/auto/accessibility/tst_accessibility.cpp b/tests/auto/accessibility/tst_accessibility.cpp index 0224f020..868b4413 100644 --- a/tests/auto/accessibility/tst_accessibility.cpp +++ b/tests/auto/accessibility/tst_accessibility.cpp @@ -100,7 +100,7 @@ void tst_accessibility::a11y_data() QTest::newRow("StackView") << "stackview" << QAccessible::LayeredPane << ""; QTest::newRow("SwipeDelegate") << "swipedelegate" << QAccessible::ListItem << "SwipeDelegate"; QTest::newRow("SwipeView") << "swipeview" << QAccessible::PageTabList << ""; - QTest::newRow("Switch") << "switch" << QAccessible::Button << "Switch"; + QTest::newRow("Switch") << "switch" << QAccessible::CheckBox << "Switch"; QTest::newRow("SwitchDelegate") << "switchdelegate" << QAccessible::ListItem << "SwitchDelegate"; QTest::newRow("TabBar") << "tabbar" << QAccessible::PageTabList << ""; QTest::newRow("TabButton") << "tabbutton" << QAccessible::PageTab << "TabButton"; -- cgit v1.2.3