diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-03 15:37:26 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-03 15:37:26 +0100 |
commit | 80ec5b0367b8e7aedd51ecfac459c53670fc7c35 (patch) | |
tree | fa1682cd8a96374c1bd919d62b16fa860fb87def /src/webengine/api | |
parent | c9c038430bf21909f2038ba66a6c85faf0989dd4 (diff) | |
parent | 171bdc9f0e9a563b0d70643637d0b6a8e5661d17 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
tests/auto/quick/qquickwebengineview/BLACKLIST
Change-Id: I365daa73d2eb422ac916c32b86c5ad0d3c32086d
Diffstat (limited to 'src/webengine/api')
-rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 15 | ||||
-rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 1 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 8f5313a9d..bcbf95569 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -750,6 +750,17 @@ QQuickWebEngineViewAccessible::QQuickWebEngineViewAccessible(QQuickWebEngineView : QAccessibleObject(o) {} +bool QQuickWebEngineViewAccessible::isValid() const +{ + if (!QAccessibleObject::isValid()) + return false; + + if (!engineView() || !engineView()->d_func()) + return false; + + return true; +} + QAccessibleInterface *QQuickWebEngineViewAccessible::parent() const { QQuickItem *parent = engineView()->parentItem(); @@ -773,9 +784,9 @@ int QQuickWebEngineViewAccessible::childCount() const QAccessibleInterface *QQuickWebEngineViewAccessible::child(int index) const { - if (index == 0 && engineView()) + if (index == 0 && isValid()) return engineView()->d_func()->adapter->browserAccessible(); - return 0; + return nullptr; } int QQuickWebEngineViewAccessible::indexOfChild(const QAccessibleInterface *c) const diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index 1f024167f..6f9b552ec 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -235,6 +235,7 @@ class QQuickWebEngineViewAccessible : public QAccessibleObject { public: QQuickWebEngineViewAccessible(QQuickWebEngineView *o); + bool isValid() const override; QAccessibleInterface *parent() const override; QAccessibleInterface *focusChild() const override; int childCount() const override; |