From fdcf66f10fd4f50f99c3a124626f6f4e6033a575 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 7 May 2014 10:14:50 +0200 Subject: Accessibility Android: Do not always append role MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-36584 Change-Id: Id14962a9eb7a6c3ea78cefcfcc053fac886ba8f7 Reviewed-by: Jan Arve Sæther --- src/plugins/platforms/android/androidjniaccessibility.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/plugins/platforms/android/androidjniaccessibility.cpp b/src/plugins/platforms/android/androidjniaccessibility.cpp index b987c49c9c..2891152c3d 100644 --- a/src/plugins/platforms/android/androidjniaccessibility.cpp +++ b/src/plugins/platforms/android/androidjniaccessibility.cpp @@ -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) -- cgit v1.2.3