diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-02 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-02 01:00:08 +0100 |
| commit | 607338f98feaa2561340c7ff4249d470b36d0503 (patch) | |
| tree | aec623c5af7ec8a6e2f0ac530425ee98a720772c /src/android | |
| parent | f58e47c2f34c6a703115c9b4486040ba12bd97e9 (diff) | |
| parent | f5850cb0da5d9b610711d4fd3c1eaded9d6414e1 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I83f6ed9480bf21020ce7a9431010d87a88df84a1
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java index 4746920e2a..a4d134d0fa 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -344,7 +344,9 @@ public class QtActivityDelegate } } else if ((inputHints & ImhHiddenText) != 0) { inputType |= android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD; - } else if ((inputHints & ImhSensitiveData) != 0 || (inputHints & ImhNoPredictiveText) != 0) { + } else if ((inputHints & ImhSensitiveData) != 0 || + ((inputHints & ImhNoPredictiveText) != 0 && + System.getenv("QT_ANDROID_ENABLE_WORKAROUND_TO_DISABLE_PREDICTIVE_TEXT") != null)) { inputType |= android.text.InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD; } |