Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I2a54058b64ac69c78b4120fdaf09b96e025a4c6c

1 files changed, 3 insertions, 18 deletions

diff --git a/util/accessibilityinspector/accessibilityinspector.cpp b/util/accessibilityinspector/accessibilityinspector.cpp
index bf55c36df9..df83377296 100644
--- a/util/accessibilityinspector/accessibilityinspector.cpp
+++ b/util/accessibilityinspector/accessibilityinspector.cpp
@@ -99,6 +99,8 @@ AccessibilityInspector::~AccessibilityInspector()
 void AccessibilityInspector::inspectWindow(QWindow *window)
 {
     qDebug() << "AccessibilityInspector::inspectWindow()" << window;
+    if (window->parent() || window->transientParent())
+        return;
 
     optionsWidget = new OptionsWidget();
 
@@ -164,23 +166,6 @@ void AccessibilityInspector::saveWindowGeometry()
 
 QString translateRole(QAccessible::Role role)
 {
-    if (role == 0x2B)
-        return "PushButton";
-    if (role == 0x2C)
-        return "CheckBox";
-    if (role == 0x2D)
-        return "RadioButton";
-    if (role == 0xA)
-        return "Client";
-    if (role == 0x29)
-        return "Static Text";
-    if (role == 0x33)
-        return "Slider";
-    if (role == 0x33)
-        return "Slider";
-    if (role == 0x10)
-        return "Pane";
-
-    return QString::number(role, 16);
+    return qAccessibleRoleString(role);
 }