diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2018-12-14 13:15:31 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-18 15:58:19 +0100 |
| commit | 50fac0d1d7e82f2423e0a3e557b4a1f30be5bf33 (patch) | |
| tree | b085f03fdafa4ecbcfcb5a96b68404e155879b6a /src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp | |
| parent | 8124f0bc1893e0997989913044665fa1c5cf79d7 (diff) | |
| parent | 4f1e0003d98116e33a847360e0e95c46daae25fc (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/core/compositor/delegated_frame_node.cpp
src/core/profile_adapter.cpp
src/core/profile_io_data_qt.cpp
src/webengine/api/qquickwebengineprofile.cpp
src/webenginewidgets/api/qwebengineprofile.cpp
Change-Id: I35ec8480e758bbcb6c5942a5401cb1b6dbdcc428
Diffstat (limited to 'src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp')
| -rw-r--r-- | src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp index 45e87477f..5b464a461 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp @@ -107,7 +107,6 @@ RenderWidgetHostViewQtDelegateWidget::RenderWidgetHostViewQtDelegateWidget(Rende , m_client(client) , m_rootItem(new RenderWidgetHostViewQuickItem(client)) , m_isPopup(false) - , m_isPasswordInput(false) { setFocusPolicy(Qt::StrongFocus); @@ -347,14 +346,10 @@ void RenderWidgetHostViewQtDelegateWidget::move(const QPoint &screenPos) void RenderWidgetHostViewQtDelegateWidget::inputMethodStateChanged(bool editorVisible, bool passwordInput) { - if (qApp->inputMethod()->isVisible() == editorVisible && m_isPasswordInput == passwordInput) - return; - QQuickWidget::setAttribute(Qt::WA_InputMethodEnabled, editorVisible && !passwordInput); - m_isPasswordInput = passwordInput; - qApp->inputMethod()->update(Qt::ImQueryInput | Qt::ImEnabled | Qt::ImHints); - qApp->inputMethod()->setVisible(editorVisible); + if (qApp->inputMethod()->isVisible() != editorVisible) + qApp->inputMethod()->setVisible(editorVisible); } void RenderWidgetHostViewQtDelegateWidget::setInputMethodHints(Qt::InputMethodHints hints) |