Accessible: Return StaticText if there is no explicit role set

Before, it would assume that StaticText was the role if the item
could be cast to a QQuickText. It should only do this if the role
is not explicitly set, in case it is not really StaticText in the
attached property.

Change-Id: I800810f1347fc9aa412c4ca5d180f78d27a89b38
Reviewed-by: Andre de la Rocha <andre.rocha@qt.io>

1 files changed, 6 insertions, 4 deletions

diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp
index 87e581384b..98e7663c96 100644
--- a/src/quick/accessible/qaccessiblequickitem.cpp
+++ b/src/quick/accessible/qaccessiblequickitem.cpp
@@ -205,14 +205,16 @@ QAccessible::Role QAccessibleQuickItem::role() const
     // Workaround for setAccessibleRole() not working for
     // Text items. Text items are special since they are defined
     // entirely from C++ (setting the role from QML works.)
-    if (qobject_cast<QQuickText*>(const_cast<QQuickItem *>(item())))
-        return QAccessible::StaticText;
 
     QAccessible::Role role = QAccessible::NoRole;
     if (item())
         role = QQuickItemPrivate::get(item())->accessibleRole();
-    if (role == QAccessible::NoRole)
-        role = QAccessible::Client;
+    if (role == QAccessible::NoRole) {
+        if (qobject_cast<QQuickText*>(const_cast<QQuickItem *>(item())))
+            role = QAccessible::StaticText;
+        else
+            role = QAccessible::Client;
+    }
 
     return role;
 }