From d482d8b1b5ecf447c41f47db140f1c9e15177477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= Date: Wed, 3 Feb 2021 11:49:47 +0100 Subject: a11y: Report mixed state if QCheckBox is PartiallyChecked Previously it only returned checked or unchecked for a tri-state checkbox. Fixes: QTBUG-84616 Change-Id: Ife72098e35f8295fd389bda232de5478ffa7e87f Reviewed-by: Volker Hilsheimer (cherry picked from commit f4887aca1e5ac7b90abf862d7c9828417a74a1b6) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac.cpp | 2 +- tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.h | 3 ++- tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac.cpp b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac.cpp index ba0562f049..e684c1ee34 100644 --- a/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac.cpp +++ b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac.cpp @@ -143,7 +143,7 @@ void tst_QAccessibilityMac::checkBoxTest() QVERIFY(QTest::qWaitForWindowExposed(m_window)); QCoreApplication::processEvents(); - QVERIFY(testCheckBox()); + QVERIFY(testCheckBox(cb)); } QTEST_MAIN(tst_QAccessibilityMac) diff --git a/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.h b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.h index 75b2d39a00..58ea2d02b0 100644 --- a/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.h +++ b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.h @@ -28,6 +28,7 @@ #include #include #include +#include #pragma once // Yeah, it's deprecated in general, but it's standard practice for Mac OS X. @@ -37,4 +38,4 @@ bool testLineEdit(); bool testHierarchy(QWidget *w); bool singleWidget(); bool notifications(QWidget *w); -bool testCheckBox(); +bool testCheckBox(QCheckBox *ckBox); diff --git a/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm index 4ebf7a37f9..d97a0db939 100644 --- a/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm +++ b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm @@ -565,7 +565,7 @@ bool notifications(QWidget *w) return true; } -bool testCheckBox() +bool testCheckBox(QCheckBox *ckBox) { TestAXObject *appObject = [TestAXObject getApplicationAXObject]; EXPECT(appObject); @@ -596,5 +596,8 @@ bool testCheckBox() [cb performAction:kAXPressAction]; EXPECT([cb valueNumber] == 0); + ckBox->setCheckState(Qt::PartiallyChecked); + EXPECT([cb valueNumber] == 2); + return true; } -- cgit v1.2.3