diff options
author | Paul Olav Tvete <paul.tvete@digia.com> | 2013-09-30 16:30:39 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-02 07:40:41 +0200 |
commit | 17f16c80e5d6b056ccd396bac5278c9e82bde3c5 (patch) | |
tree | 1993fba8c3d7166315bf0db302e85dc7cd872bfd /src/android/jar | |
parent | d14abab0d3c4d51077f9169f4a09ba3202eaa4a7 (diff) |
Android: update copied enum values in Java code
The InputMethodHint enum values were changed between Qt 4.8 and 5.1, and
the hardcoded copies were not updated. Thanks to Lasconic for finding
the solution to this problem.
Task-number: QTBUG-32072
Task-number: QTBUG-32710
Change-Id: I3eb1192911a9c48d7720e85b91bee1af693a669d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/android/jar')
-rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java | 29 |
1 files changed, 17 insertions, 12 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 dff437c3d8..11af4d4280 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -141,26 +141,31 @@ public class QtActivityDelegate } } - // case status - private final int ImhNoAutoUppercase = 0x2; - private final int ImhPreferUppercase = 0x8; - @SuppressWarnings("unused") - private final int ImhPreferLowercase = 0x10; - private final int ImhUppercaseOnly = 0x40000; - private final int ImhLowercaseOnly = 0x80000; - - // options - private final int ImhNoPredictiveText = 0x20; - // layout + // input method hints - must be kept in sync with QTDIR/src/corelib/global/qnamespace.h private final int ImhHiddenText = 0x1; - private final int ImhPreferNumbers = 0x4; + private final int ImhSensitiveData = 0x2; + private final int ImhNoAutoUppercase = 0x4; + private final int ImhPreferNumbers = 0x8; + private final int ImhPreferUppercase = 0x10; + private final int ImhPreferLowercase = 0x20; + private final int ImhNoPredictiveText = 0x40; + + private final int ImhDate = 0x80; + private final int ImhTime = 0x100; + + private final int ImhPreferLatin = 0x200; + private final int ImhMultiLine = 0x400; + private final int ImhDigitsOnly = 0x10000; private final int ImhFormattedNumbersOnly = 0x20000; + private final int ImhUppercaseOnly = 0x40000; + private final int ImhLowercaseOnly = 0x80000; private final int ImhDialableCharactersOnly = 0x100000; private final int ImhEmailCharactersOnly = 0x200000; private final int ImhUrlCharactersOnly = 0x400000; + private final int ImhLatinOnly = 0x800000; // application state private final int ApplicationSuspended = 0x0; |