Accessibility Android: Do not always append role
Task-number: QTBUG-36584 Change-Id: Id14962a9eb7a6c3ea78cefcfcc053fac886ba8f7 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>bb10
parent
c8db539742
commit
fdcf66f10f
|
|
@ -184,8 +184,6 @@ if (!clazz) { \
|
|||
desc = iface->text(QAccessible::Name);
|
||||
if (desc.isEmpty())
|
||||
desc = iface->text(QAccessible::Description);
|
||||
|
||||
desc += QChar(' ') + QString::fromUtf8(qAccessibleRoleString(iface->role()));
|
||||
}
|
||||
|
||||
jstring jdesc = env->NewString((jchar*) desc.constData(), (jsize) desc.size());
|
||||
|
|
@ -216,12 +214,6 @@ if (!clazz) { \
|
|||
}
|
||||
}
|
||||
|
||||
if ((iface->role() != QAccessible::NoRole) &&
|
||||
(iface->role() != QAccessible::Client) &&
|
||||
(iface->role() != QAccessible::Pane)) {
|
||||
desc += QChar(' ') + QString::fromUtf8(qAccessibleRoleString(iface->role()));
|
||||
}
|
||||
|
||||
CALL_METHOD(node, "setEnabled", "(Z)V", !state.disabled)
|
||||
//CALL_METHOD(node, "setFocusable", "(Z)V", state.focusable)
|
||||
CALL_METHOD(node, "setFocusable", "(Z)V", true)
|
||||
|
|
|
|||
Loading…
Reference in New Issue