diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-27 18:17:09 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-28 13:54:49 +0100 |
commit | 01dce2df9868fd7ede0fcc7b253f57d1e3d4a101 (patch) | |
tree | 689d6d2dfe262c050f58538d6e63516f676dbd0d /src/webengine/api/qquickwebengineview.cpp | |
parent | c68c8cb21b47024bbc6c9d15734677318f56ca3f (diff) | |
parent | dad0cfa3eba01b0dff698f457242f80f6eae4698 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
src/3rdparty
src/core/render_widget_host_view_qt.cpp
src/core/web_contents_view_qt.h
src/core/web_engine_context.cpp
Change-Id: I17f3a4814e88a5680dc61a6d734c171ccba00e8c
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
-rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 3290fe448..9826ebfe2 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -348,12 +348,16 @@ void QQuickWebEngineViewPrivate::runFileChooser(QSharedPointer<FilePickerControl ui()->showFilePicker(controller); } -void QQuickWebEngineViewPrivate::passOnFocus(bool reverse) +bool QQuickWebEngineViewPrivate::passOnFocus(bool reverse) { Q_Q(QQuickWebEngineView); // The child delegate currently has focus, find the next one from there and give it focus. QQuickItem *next = q->scopedFocusItem()->nextItemInFocusChain(!reverse); - next->forceActiveFocus(reverse ? Qt::BacktabFocusReason : Qt::TabFocusReason); + if (next) { + next->forceActiveFocus(reverse ? Qt::BacktabFocusReason : Qt::TabFocusReason); + return true; + } + return false; } void QQuickWebEngineViewPrivate::titleChanged(const QString &title) |