diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-16 22:07:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 22:07:33 +0200 |
| commit | ac41ad48cacac91e428181f7ededb0896ee64c40 (patch) | |
| tree | 44b4afb881fd0b7aa29b0a9da22dddf8e91a4be2 /src/webengine/render_widget_host_view_qt_delegate_quick.cpp | |
| parent | 6534b09073791398bad99863821740e986915bff (diff) | |
| parent | 6e4d1a0cf21ee18d6584042cd9bea3a7d1d24a56 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Id5f97771be23a4393e8d3be98903c321377ae809
Diffstat (limited to 'src/webengine/render_widget_host_view_qt_delegate_quick.cpp')
| -rw-r--r-- | src/webengine/render_widget_host_view_qt_delegate_quick.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp index c04e20a5e..c17c6da06 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -136,7 +136,7 @@ void RenderWidgetHostViewQtDelegateQuick::setKeyboardFocus() bool RenderWidgetHostViewQtDelegateQuick::hasKeyboardFocus() { - return hasFocus(); + return hasActiveFocus(); } void RenderWidgetHostViewQtDelegateQuick::lockMouse() |