Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	src/3rdparty
	tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp

Change-Id: I070173576fc4be53689ce0dd9e1fd4133f5814da

1 files changed, 6 insertions, 2 deletions

diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index fef3831e3..0d153dec2 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -116,7 +116,7 @@ static inline Qt::InputMethodHints toQtInputMethodHints(ui::TextInputType inputT
     case ui::TEXT_INPUT_TYPE_SEARCH:
         return Qt::ImhPreferLowercase | Qt::ImhNoAutoUppercase;
     case ui::TEXT_INPUT_TYPE_PASSWORD:
-        return Qt::ImhSensitiveData | Qt::ImhNoPredictiveText | Qt::ImhNoAutoUppercase;
+        return Qt::ImhSensitiveData | Qt::ImhNoPredictiveText | Qt::ImhNoAutoUppercase | Qt::ImhHiddenText;
     case ui::TEXT_INPUT_TYPE_EMAIL:
         return Qt::ImhEmailCharactersOnly;
     case ui::TEXT_INPUT_TYPE_NUMBER:
@@ -575,6 +575,7 @@ void RenderWidgetHostViewQt::TextInputStateChanged(const content::TextInputState
 {
     m_currentInputType = params.type;
     m_delegate->inputMethodStateChanged(params.type != ui::TEXT_INPUT_TYPE_NONE);
+    m_delegate->setInputMethodHints(toQtInputMethodHints(params.type));
 }
 
 void RenderWidgetHostViewQt::ImeCancelComposition()
@@ -1115,7 +1116,10 @@ void RenderWidgetHostViewQt::handleInputMethodEvent(QInputMethodEvent *ev)
             QGuiApplication::postEvent(qApp->focusObject(), eventCopy);
         } else {
             m_receivedEmptyImeText = false;
-            m_host->ImeCancelComposition();
+            if (m_imeInProgress) {
+                m_imeInProgress = false;
+                m_host->ImeCancelComposition();
+            }
         }
     }
 }