diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 11:14:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 11:14:18 +0200 |
| commit | 17548a0b1965074fff5b3036f77ea8261a132c92 (patch) | |
| tree | 25f1ec36d43d0e7ab4f3110929a2c3b39329a13e /tests/auto | |
| parent | f58add00ffa5dd5b3fd7bc31bf3cacc452cb8e5c (diff) | |
| parent | e99680e6577a52fb07096eb45095125bb90cf980 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/virtualkeyboard/lipisharedrecognizer.cpp
src/virtualkeyboard/styles/styles.pro
src/virtualkeyboard/virtualkeyboard.pro
Change-Id: I150f2ad265f8a7bd07be1d9415cdad854e200e87
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/inputpanel/data/tst_inputpanel.qml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml index 908fb7af..980fbc01 100644 --- a/tests/auto/inputpanel/data/tst_inputpanel.qml +++ b/tests/auto/inputpanel/data/tst_inputpanel.qml @@ -224,7 +224,7 @@ Rectangle { // function key press { initText: "x", initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase, inputKey: Qt.Key_Shift, outputKeyCountMin: 1, outputKey: Qt.Key_Shift, preview: false, outputKeyText: "", outputKeyModifiers: Qt.NoModifier, outputKeyRepeat: false, outputText: "x" }, { initText: "x", initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase, inputKey: Qt.Key_Backspace, outputKeyCountMin: 1, outputKey: Qt.Key_Backspace, preview: false, outputKeyText: "", outputKeyModifiers: Qt.NoModifier, outputKeyRepeat: false, outputText: "" }, - { initText: "xxxxxx", initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase, inputKey: Qt.Key_Backspace, keyHold: 600 + 8 * 50, outputKeyCountMin: 6, outputKey: Qt.Key_Backspace, preview: false, outputKeyText: "", outputKeyModifiers: Qt.NoModifier, outputKeyRepeat: true, outputText: "" }, + { initText: "xxxxxx", initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase, inputKey: Qt.Key_Backspace, keyHold: 1000, outputKeyCountMin: 6, outputKey: Qt.Key_Backspace, preview: false, outputKeyText: "", outputKeyModifiers: Qt.NoModifier, outputKeyRepeat: true, outputText: "" }, ] } @@ -235,7 +235,9 @@ Rectangle { inputPanel.virtualKeyClickedSpy.clear() if (data.hasOwnProperty("keyHold")) { inputPanel.virtualKeyPress(data.inputKey) - wait(data.keyHold) + do { + inputPanel.virtualKeyClickedSpy.wait(data.keyHold) + } while (inputPanel.virtualKeyClickedSpy.count < data.outputKeyCountMin) inputPanel.virtualKeyRelease() } else { inputPanel.virtualKeyClick(data.inputKey) |