Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ie6d44caf1d630cb029178a1af40c637f24a25ee7

1 files changed, 10 insertions, 0 deletions

diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtEditText.java b/src/android/jar/src/org/qtproject/qt5/android/QtEditText.java
index 7e3ebb539a..593746aac9 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtEditText.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtEditText.java
@@ -53,22 +53,32 @@ public class QtEditText extends View
     int m_initialCapsMode = 0;
     int m_imeOptions = 0;
     int m_inputType = InputType.TYPE_CLASS_TEXT;
+    boolean m_optionsChanged = false;
     QtActivityDelegate m_activityDelegate;
 
     public void setImeOptions(int m_imeOptions)
     {
+        if (m_imeOptions == this.m_imeOptions)
+            return;
         this.m_imeOptions = m_imeOptions;
+        m_optionsChanged = true;
     }
 
     public void setInitialCapsMode(int m_initialCapsMode)
     {
+        if (m_initialCapsMode == this.m_initialCapsMode)
+            return;
         this.m_initialCapsMode = m_initialCapsMode;
+        m_optionsChanged = true;
     }
 
 
     public void setInputType(int m_inputType)
     {
+        if (m_inputType == this.m_inputType)
+            return;
         this.m_inputType = m_inputType;
+        m_optionsChanged = true;
     }
 
     public QtEditText(Context context, QtActivityDelegate activityDelegate)