AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

a11y: Don't try to update accessibility if there's no interface

Browse Source 
Change-Id: I970729e65ba0eb857e6974f9947f27ae8e6410c3
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
This commit is contained in:
Tor Arne Vestbø 2014-09-03 13:47:42 +02:00
parent 076d22efa6
commit bbacf3d79d
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/accessible/qaccessible.cpp
View File

@ -861,15 +861,20 @@ void QAccessible::setRootObject(QObject *object)
*/
void QAccessible::updateAccessibility(QAccessibleEvent *event)
{
if (!isActive())
// NOTE: Querying for the accessibleInterface below will result in
// resolving and caching the interface, which in some cases will
// cache the wrong information as updateAccessibility is called
// during construction of widgets. If you see cases where the
// cache seems wrong, this call is "to blame", but the code that
// caches dynamic data should be updated to handle change events.
if (!isActive() || !event->accessibleInterface())
return;
#ifndef QT_NO_ACCESSIBILITY
if (event->type() == QAccessible::TableModelChanged) {
if (QAccessibleInterface *iface = event->accessibleInterface()) {
if (iface->tableInterface())
iface->tableInterface()->modelChange(static_cast<QAccessibleTableModelChangeEvent*>(event));
}
QAccessibleInterface *iface = event->accessibleInterface();
if (iface && iface->tableInterface())
iface->tableInterface()->modelChange(static_cast<QAccessibleTableModelChangeEvent*>(event));
}
if (updateHandler) {

26
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
View File

@ -939,29 +939,19 @@ void tst_QAccessibility::mainWindowTest()
window.show();
QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
// We currently don't have an accessible interface for QWindow
// the active state is either in the QMainWindow or QQuickView
// QAccessibleInterface *windowIface(QAccessible::queryAccessibleInterface(&window));
// QVERIFY(windowIface->state().active);
// We currently don't have an accessible interface for QWindow
// the active state is either in the QMainWindow or QQuickView
QAccessibleInterface *windowIface(QAccessible::queryAccessibleInterface(&window));
QVERIFY(!windowIface);
QAccessible::State activeState;
activeState.active = true;
// We should still not crash if we somehow end up sending state change events
// Note that we do not QVERIFY_EVENT, as that relies on the updateHandler being
// called, which does not happen/make sense when there's no interface for the event.
QAccessibleStateChangeEvent active(&window, activeState);
QVERIFY_EVENT(&active);
QWindow child;
child.setParent(&window);
child.setGeometry(10, 10, 20, 20);
child.show();
child.requestActivate();
QTRY_VERIFY(QGuiApplication::focusWindow() == &child);
QAccessibleStateChangeEvent deactivate(&window, activeState);
QVERIFY_EVENT(&deactivate); // deactivation of parent
QAccessibleStateChangeEvent activeChild(&child, activeState);
QVERIFY_EVENT(&activeChild);
}
}