summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-07-10 14:15:48 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-07-11 14:52:07 +0200
commit5c62c7f57577703015fc46795a70465e23ae775b (patch)
treeb9abf78a5bafc34d798b80c4d1f8630659b5316d
parent1df15a830112bb6df104a94453105c74ada0fbf5 (diff)
downloadqtwebengine-5c62c7f57577703015fc46795a70465e23ae775b.tar.gz
Fix duplicate document role
The blink root element already has document as role. By setting it in the webview we'd get two documents in the hierarchy. Change-Id: Ie14e57b4e2050dbd9495c4fa94de4e2faebc02c1 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r--src/webenginewidgets/api/qwebengineview_p.h2
-rw-r--r--tests/auto/widgets/qwebengineaccessibility/tst_qwebengineaccessibility.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/webenginewidgets/api/qwebengineview_p.h b/src/webenginewidgets/api/qwebengineview_p.h
index 9f0790117..8a657538e 100644
--- a/src/webenginewidgets/api/qwebengineview_p.h
+++ b/src/webenginewidgets/api/qwebengineview_p.h
@@ -67,7 +67,7 @@ public:
class QWebEngineViewAccessible : public QAccessibleWidget
{
public:
- QWebEngineViewAccessible(QWebEngineView *o) : QAccessibleWidget(o, QAccessible::Document)
+ QWebEngineViewAccessible(QWebEngineView *o) : QAccessibleWidget(o)
{}
int childCount() const Q_DECL_OVERRIDE;
diff --git a/tests/auto/widgets/qwebengineaccessibility/tst_qwebengineaccessibility.cpp b/tests/auto/widgets/qwebengineaccessibility/tst_qwebengineaccessibility.cpp
index 6cc7ac799..2d217e362 100644
--- a/tests/auto/widgets/qwebengineaccessibility/tst_qwebengineaccessibility.cpp
+++ b/tests/auto/widgets/qwebengineaccessibility/tst_qwebengineaccessibility.cpp
@@ -71,6 +71,7 @@ void tst_QWebEngineView::noPage()
QTest::qWait(1000);
QAccessibleInterface *view = QAccessible::queryAccessibleInterface(&webView);
QVERIFY(view);
+ QCOMPARE(view->role(), QAccessible::Client);
QCOMPARE(view->childCount(), 1);
QAccessibleInterface *document = view->child(0);
QCOMPARE(document->role(), QAccessible::Document);
@@ -90,6 +91,7 @@ void tst_QWebEngineView::hierarchy()
QAccessibleInterface *view = QAccessible::queryAccessibleInterface(&webView);
QVERIFY(view);
+ QCOMPARE(view->role(), QAccessible::Client);
QCOMPARE(view->childCount(), 1);
// Wait for accessibility to be fully initialized
QTRY_VERIFY(view->child(0)->childCount() == 1);