From ba888bb8c8e6fce76efc855ef81250f2c9426b40 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 5 Jan 2012 18:03:04 +0100 Subject: Clean up and extend QAccessible::State. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The state should contain useful and clear information. Some of the old enum/bitfield members were not really clear. Make them follow Qt terminology and shift the burden of interpreting them to the bridge. Apart from the previous commit changing from enum to bitfield, these flags have changed names: unavailable -> disabled mixed -> checkStateMixed protected -> passwordEdit (in the last commit) floating is completely removed, even MSAA documentation states it is unsupported. Some new states have been added. Documentation added. Change-Id: I152256e77a061f28ee5780f527524c80a2c7e333 Reviewed-by: Jan-Arve Sæther --- tests/auto/other/qaccessibility/tst_qaccessibility.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index 3190ef74eb..90ab5b4c67 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -466,7 +466,7 @@ void tst_QAccessibility::deletedWidget() void tst_QAccessibility::statesStructTest() { QAccessible::State s1; - QVERIFY(s1.unavailable == 0); + QVERIFY(s1.disabled == 0); QVERIFY(s1.focusable == 0); QVERIFY(s1.modal == 0); @@ -1741,7 +1741,7 @@ void tst_QAccessibility::mdiSubWindowTest() QVERIFY(interface->state().invisible); testWindow->setVisible(true); testWindow->setEnabled(false); - QVERIFY(interface->state().unavailable); + QVERIFY(interface->state().disabled); testWindow->setEnabled(true); qApp->setActiveWindow(&mdiArea); mdiArea.setActiveSubWindow(testWindow); -- cgit v1.2.3