diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-19 13:27:34 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-19 13:27:34 +0100 |
| commit | 1e204ff6e91227de3bd2f105a1efbaf47ee2b5aa (patch) | |
| tree | 1609ebd46902d5c568d3df08e593ff2b5919cbbc /src/webengine/api/qquickwebengineview_p_p.h | |
| parent | 18b0081aeda8fcd5c2d756c47bdd63cb7f89e891 (diff) | |
| parent | 8b048ef2ba4e8414f4852f791964878a6dc3f00f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Blacklisted one test requiring an update of qt5.git.
Conflicts:
.qmake.conf
Change-Id: I75e55a1c5f8840cde55ddb60d632287b2affadeb
Diffstat (limited to 'src/webengine/api/qquickwebengineview_p_p.h')
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index 8557a8db5..1f024167f 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -236,6 +236,7 @@ class QQuickWebEngineViewAccessible : public QAccessibleObject public: QQuickWebEngineViewAccessible(QQuickWebEngineView *o); QAccessibleInterface *parent() const override; + QAccessibleInterface *focusChild() const override; int childCount() const override; QAccessibleInterface *child(int index) const override; int indexOfChild(const QAccessibleInterface*) const override; |