Fix accessibility for <p> tags with Windows NarratorHEADdev

QAccessible::Paragraph maps to a Text control on Windows, which
causes Narrator to completely ignore its child nodes. Since even a
simple <p>Content</p> generates two nodes, a nameless parent
kParagraph and a named child kStaticText, the result is that
Narrator will see a Text node with no name, and simply read "text".

This change maps the kParagraph role to QAccessible::Grouping, which
allows Narrator to see its child nodes and read their contents aloud.

Fixes: QTBUG-134055
Pick-to: 6.10 6.9 6.8
Change-Id: I96d4262bd4149f1dec50d47491263d0b022d4b83
Reviewed-by: Allan Sandfeld Jensen <[email protected]>

2 files changed, 4 insertions, 4 deletions

diff --git a/src/core/browser_accessibility_qt.cpp b/src/core/browser_accessibility_qt.cpp
index e7875577e..ce6080716 100644
--- a/src/core/browser_accessibility_qt.cpp
+++ b/src/core/browser_accessibility_qt.cpp
@@ -703,7 +703,7 @@ QAccessible::Role BrowserAccessibilityInterface::role() const
     case ax::mojom::Role::kPane:
         return QAccessible::Pane;
     case ax::mojom::Role::kParagraph:
-        return QAccessible::Paragraph;
+        return QAccessible::Grouping; // QAccessible::Paragraph causes child nodes to be ignored by Windows Narrator
     case ax::mojom::Role::kPdfActionableHighlight:
         return QAccessible::Button;
     case ax::mojom::Role::kPdfRoot:
diff --git a/tests/auto/widgets/accessibility/tst_accessibility.cpp b/tests/auto/widgets/accessibility/tst_accessibility.cpp
index 9e69e3139..8db7d3314 100644
--- a/tests/auto/widgets/accessibility/tst_accessibility.cpp
+++ b/tests/auto/widgets/accessibility/tst_accessibility.cpp
@@ -548,7 +548,7 @@ void tst_Accessibility::roles_data()
     QTest::newRow("ax::mojom::Role::kNavigation") << QString("<nav>a</nav>") << 0 << QAccessible::Section;
     QTest::newRow("ax::mojom::Role::kNote") << QString("<div role='note'>a</div>") << 0 << QAccessible::Note;
     //QTest::newRow("ax::mojom::Role::kPane"); // No mapping to ARIA role
-    QTest::newRow("ax::mojom::Role::kParagraph") << QString("<p>a</p>") << 0 << QAccessible::Paragraph;
+    QTest::newRow("ax::mojom::Role::kParagraph") << QString("<p>a</p>") << 0 << QAccessible::Grouping;
     // QTest::newRow("ax::mojom::Role::kPdfActionableHighlight"); // No mapping to ARIA role
     // QTest::newRow("ax::mojom::Role::kPdfRoot"); // No mapping to ARIA role
     QTest::newRow("ax::mojom::Role::kPluginObject")
@@ -659,7 +659,7 @@ void tst_Accessibility::objectName()
     QAccessibleInterface *p = document->child(0);
     QVERIFY(p);
     QVERIFY(p->object());
-    QCOMPARE(p->role(), QAccessible::Paragraph);
+    QCOMPARE(p->role(), QAccessible::Grouping);
     QCOMPARE(p->object()->objectName(), QStringLiteral("my_id"));
 }
 
@@ -689,7 +689,7 @@ void tst_Accessibility::crossTreeParent()
     p = p->child(0);
     QVERIFY(p);
     QVERIFY(p->object());
-    QCOMPARE(p->role(), QAccessible::Paragraph);
+    QCOMPARE(p->role(), QAccessible::Grouping);
     QCOMPARE(p->parent(), subdocument);
     QCOMPARE(p->parent()->parent()->parent()->parent(), view->child(0));
     QCOMPARE(p->parent()->parent()->parent()->parent()->parent(), view);