aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorJarkko Koivikko <jarkko.koivikko@code-q.fi>2015-12-01 15:29:24 +0200
committerJarkko Koivikko <jarkko.koivikko@code-q.fi>2015-12-07 07:20:28 +0000
commit97d9648f5d950ea7d7b64f5c2db67359e8f47013 (patch)
tree62374298f3e3d1d2d1ba33a1036b89aadc6af8c3 /tests/auto
parent180f8c92ef6d64c50efbedf643d66ca8ea6df1f2 (diff)
Improve build configuration
Add new configuration flags to simplify the customization process of the virtual keyboard. - lang-<code> flag enables the specified language. - lang-all flag enables all the languages. - handwriting flag enables the handwriting input method (t9write or lipi-toolkit) Updated test cases and also fixed the virtual keyboard for single language support. Change-Id: I599816bed591bd193ad26cef0e9bf4812146e865 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/inputpanel/data/inputpanel/inputpanel.qml8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml
index 6aee4b26..5f864445 100644
--- a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml
+++ b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml
@@ -181,8 +181,8 @@ InputPanel {
function setLocale(inputLocale) {
VirtualKeyboardSettings.locale = inputLocale
if (["ar", "fa"].indexOf(inputLocale.substring(0, 2)) !== -1)
- return Qt.inputMethod.locale.name.substring(0, 2) === inputLocale.substring(0, 2)
- return Qt.inputMethod.locale.name === inputLocale
+ return inputPanel.keyboard.locale.substring(0, 2) === inputLocale.substring(0, 2)
+ return inputPanel.keyboard.locale === inputLocale
}
function setActiveLocales(activeLocales) {
@@ -267,6 +267,10 @@ InputPanel {
}
function multiLayoutKeyActionHelper(key, keyActionOnCurrentLayoutCb) {
+ if (!keyboardLayoutLoader.item) {
+ console.warn("Key not found \\u%1 (keyboard layout not loaded)".arg(key.charCodeAt(0).toString(16)))
+ return false
+ }
var success = keyActionOnCurrentLayoutCb(key)
for (var c = 0; !success && c < 2; c++) {
// Check if the current layout contains multiple layouts