diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:24:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 13:50:35 +0200 |
| commit | c7af140c1e59cd1e5f8a7361b9be593548e105a0 (patch) | |
| tree | ea0033688ff25d1ea0ac48103aad54370f4e070a /tests | |
| parent | 4437f07e2c15391144f56140a8f0cbc7a14517c1 (diff) | |
| parent | dd8c39ea9312ec1441b3fdd830f9d42fe3258b58 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/virtualkeyboard/t9writeworker.cpp
src/virtualkeyboard/t9writeworker.h
Change-Id: I1fa1567e2739766c55c0e94b10706eecb8ba2ae1
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/inputpanel/data/tst_inputpanel.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml index 99ed8a61..81b9b1ce 100644 --- a/tests/auto/inputpanel/data/tst_inputpanel.qml +++ b/tests/auto/inputpanel/data/tst_inputpanel.qml @@ -1061,6 +1061,8 @@ Rectangle { { initLocale: "ja_JP", initInputMode: "Hiragana", inputSequence: ["n","i","h","o","n","g","o",Qt.Key_Return], outputText: "\u306B\u307B\u3093\u3054" }, // Hiragana to Kanjie conversion { initLocale: "ja_JP", initInputMode: "Hiragana", inputSequence: ["n","i","h","o","n","g","o",Qt.Key_Space,Qt.Key_Return], outputText: "\u65E5\u672C\u8A9E" }, + // Hiragana to Kanjie conversion plus a smiley + { initLocale: "ja_JP", initInputMode: "Hiragana", inputSequence: ["n","i","h","o","n","g","o",0xE000,Qt.Key_Space,Qt.Key_Return,Qt.Key_Return], outputText: "\u65E5\u672C\u8A9E\uFF1A\u30FC\uFF09" }, // Correction to Hiragana sequence using exact match mode { initLocale: "ja_JP", initInputMode: "Hiragana", inputSequence: [ // Write part of the text leaving out "ni" from the beginning |