diff options
Diffstat (limited to 'src/virtualkeyboard')
60 files changed, 77 insertions, 71 deletions
diff --git a/src/virtualkeyboard/content/InputPanel.qml b/src/virtualkeyboard/content/InputPanel.qml index c9d46fa9..6cc64d87 100644 --- a/src/virtualkeyboard/content/InputPanel.qml +++ b/src/virtualkeyboard/content/InputPanel.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 /*! \qmltype InputPanel diff --git a/src/virtualkeyboard/content/components/AlternativeKeys.qml b/src/virtualkeyboard/content/components/AlternativeKeys.qml index f89c4c1f..c17f793a 100644 --- a/src/virtualkeyboard/content/components/AlternativeKeys.qml +++ b/src/virtualkeyboard/content/components/AlternativeKeys.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 Item { property bool active: listView.currentIndex != -1 diff --git a/src/virtualkeyboard/content/components/AutoScroller.qml b/src/virtualkeyboard/content/components/AutoScroller.qml index 9fcdf0f2..4b946648 100644 --- a/src/virtualkeyboard/content/components/AutoScroller.qml +++ b/src/virtualkeyboard/content/components/AutoScroller.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 Item { diff --git a/src/virtualkeyboard/content/components/EnterKey.qml b/src/virtualkeyboard/content/components/EnterKey.qml index f35a09bb..3bc71b30 100644 --- a/src/virtualkeyboard/content/components/EnterKey.qml +++ b/src/virtualkeyboard/content/components/EnterKey.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 /*! \qmltype EnterKey diff --git a/src/virtualkeyboard/content/components/HideKeyboardKey.qml b/src/virtualkeyboard/content/components/HideKeyboardKey.qml index 9d4ee1fd..5e4309c9 100644 --- a/src/virtualkeyboard/content/components/HideKeyboardKey.qml +++ b/src/virtualkeyboard/content/components/HideKeyboardKey.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 /*! \qmltype HideKeyboardKey diff --git a/src/virtualkeyboard/content/components/Keyboard.qml b/src/virtualkeyboard/content/components/Keyboard.qml index 33d08fe4..843d8ace 100644 --- a/src/virtualkeyboard/content/components/Keyboard.qml +++ b/src/virtualkeyboard/content/components/Keyboard.qml @@ -18,9 +18,9 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 -import QtQuick.Enterprise.VirtualKeyboard.Styles 1.1 -import QtQuick.Enterprise.VirtualKeyboard.Settings 1.0 +import QtQuick.Enterprise.VirtualKeyboard 1.2 +import QtQuick.Enterprise.VirtualKeyboard.Styles 1.2 +import QtQuick.Enterprise.VirtualKeyboard.Settings 1.2 import Qt.labs.folderlistmodel 2.0 Item { @@ -61,7 +61,7 @@ Item { function initDefaultInputMethod() { try { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.1; HunspellInputMethod {}', keyboard, "defaultInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.2; HunspellInputMethod {}', keyboard, "defaultInputMethod") } catch (e) { } return plainInputMethod } @@ -462,7 +462,7 @@ Item { var soundId = Qt.md5(sound) multiSoundEffect = __sounds[soundId] if (!multiSoundEffect) { - multiSoundEffect = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.1; MultiSoundEffect {}', soundEffect) + multiSoundEffect = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.2; MultiSoundEffect {}', soundEffect) if (multiSoundEffect) { multiSoundEffect.source = sound __sounds[soundId] = multiSoundEffect diff --git a/src/virtualkeyboard/content/components/KeyboardLayout.qml b/src/virtualkeyboard/content/components/KeyboardLayout.qml index eaebeddb..4fc8442e 100644 --- a/src/virtualkeyboard/content/components/KeyboardLayout.qml +++ b/src/virtualkeyboard/content/components/KeyboardLayout.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 /*! \qmltype KeyboardLayout @@ -36,7 +36,7 @@ import QtQuick.Enterprise.VirtualKeyboard 1.1 \code import QtQuick 2.0 import QtQuick.Layouts 1.0 - import QtQuick.Enterprise.VirtualKeyboard 1.1 + import QtQuick.Enterprise.VirtualKeyboard 1.2 // file: layouts/en_GB/main.qml diff --git a/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml b/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml index 64d66c38..4c9c8786 100644 --- a/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml +++ b/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml @@ -38,7 +38,7 @@ import QtQuick 2.0 \code import QtQuick 2.0 import QtQuick.Layouts 1.0 - import QtQuick.Enterprise.VirtualKeyboard 1.1 + import QtQuick.Enterprise.VirtualKeyboard 1.2 // file: layouts/en_GB/symbols.qml diff --git a/src/virtualkeyboard/content/components/MultitapInputMethod.qml b/src/virtualkeyboard/content/components/MultitapInputMethod.qml index 08d906ed..812eb9c8 100644 --- a/src/virtualkeyboard/content/components/MultitapInputMethod.qml +++ b/src/virtualkeyboard/content/components/MultitapInputMethod.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 InputMethod { property string multitapSequence diff --git a/src/virtualkeyboard/content/components/ShiftKey.qml b/src/virtualkeyboard/content/components/ShiftKey.qml index 71ac41d1..113dc380 100644 --- a/src/virtualkeyboard/content/components/ShiftKey.qml +++ b/src/virtualkeyboard/content/components/ShiftKey.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 /*! \qmltype ShiftKey diff --git a/src/virtualkeyboard/content/layouts/ar_AR/digits.qml b/src/virtualkeyboard/content/layouts/ar_AR/digits.qml index 6ce8148f..6d40c53e 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/digits.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/digits.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/ar_AR/main.qml b/src/virtualkeyboard/content/layouts/ar_AR/main.qml index d6bee5fb..99cb6ee5 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/main.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/main.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml b/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml index 1d83848d..403f5c43 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml b/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml index feea8aeb..a4f2038c 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/da_DK/main.qml b/src/virtualkeyboard/content/layouts/da_DK/main.qml index c67b0b4d..b716f8d8 100644 --- a/src/virtualkeyboard/content/layouts/da_DK/main.qml +++ b/src/virtualkeyboard/content/layouts/da_DK/main.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/da_DK/symbols.qml b/src/virtualkeyboard/content/layouts/da_DK/symbols.qml index e7deea0a..0d3d6a3e 100644 --- a/src/virtualkeyboard/content/layouts/da_DK/symbols.qml +++ b/src/virtualkeyboard/content/layouts/da_DK/symbols.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/de_DE/main.qml b/src/virtualkeyboard/content/layouts/de_DE/main.qml index c0227048..4bf63033 100644 --- a/src/virtualkeyboard/content/layouts/de_DE/main.qml +++ b/src/virtualkeyboard/content/layouts/de_DE/main.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/de_DE/symbols.qml b/src/virtualkeyboard/content/layouts/de_DE/symbols.qml index e7deea0a..0d3d6a3e 100644 --- a/src/virtualkeyboard/content/layouts/de_DE/symbols.qml +++ b/src/virtualkeyboard/content/layouts/de_DE/symbols.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/en_GB/dialpad.qml b/src/virtualkeyboard/content/layouts/en_GB/dialpad.qml index ecd0b705..a28c0721 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/dialpad.qml +++ b/src/virtualkeyboard/content/layouts/en_GB/dialpad.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/en_GB/digits.qml b/src/virtualkeyboard/content/layouts/en_GB/digits.qml index 6db82194..9a19bd20 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/digits.qml +++ b/src/virtualkeyboard/content/layouts/en_GB/digits.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/en_GB/main.qml b/src/virtualkeyboard/content/layouts/en_GB/main.qml index 242051ba..35632506 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/main.qml +++ b/src/virtualkeyboard/content/layouts/en_GB/main.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/en_GB/numbers.qml b/src/virtualkeyboard/content/layouts/en_GB/numbers.qml index 25aaf782..1b6c4dfc 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/numbers.qml +++ b/src/virtualkeyboard/content/layouts/en_GB/numbers.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/en_GB/symbols.qml b/src/virtualkeyboard/content/layouts/en_GB/symbols.qml index 4d8a5048..479f11fe 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/symbols.qml +++ b/src/virtualkeyboard/content/layouts/en_GB/symbols.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/es_ES/main.qml b/src/virtualkeyboard/content/layouts/es_ES/main.qml index 7dba6905..8a2958df 100644 --- a/src/virtualkeyboard/content/layouts/es_ES/main.qml +++ b/src/virtualkeyboard/content/layouts/es_ES/main.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/es_ES/symbols.qml b/src/virtualkeyboard/content/layouts/es_ES/symbols.qml index 39bde7d7..5523814a 100644 --- a/src/virtualkeyboard/content/layouts/es_ES/symbols.qml +++ b/src/virtualkeyboard/content/layouts/es_ES/symbols.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/fa_FA/digits.qml b/src/virtualkeyboard/content/layouts/fa_FA/digits.qml index 108de86d..88ea8522 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/digits.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/digits.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/fa_FA/main.qml b/src/virtualkeyboard/content/layouts/fa_FA/main.qml index 7e19a67d..0d6a7d87 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/main.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/main.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml b/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml index d6ec79dc..88e2ea08 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml b/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml index 0c3973eb..d45ec57c 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/fi_FI/main.qml b/src/virtualkeyboard/content/layouts/fi_FI/main.qml index 1b94eea8..0c273236 100644 --- a/src/virtualkeyboard/content/layouts/fi_FI/main.qml +++ b/src/virtualkeyboard/content/layouts/fi_FI/main.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/fi_FI/symbols.qml b/src/virtualkeyboard/content/layouts/fi_FI/symbols.qml index 4d8a5048..479f11fe 100644 --- a/src/virtualkeyboard/content/layouts/fi_FI/symbols.qml +++ b/src/virtualkeyboard/content/layouts/fi_FI/symbols.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/fr_FR/main.qml b/src/virtualkeyboard/content/layouts/fr_FR/main.qml index 6394e4dc..a700a499 100644 --- a/src/virtualkeyboard/content/layouts/fr_FR/main.qml +++ b/src/virtualkeyboard/content/layouts/fr_FR/main.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/fr_FR/symbols.qml b/src/virtualkeyboard/content/layouts/fr_FR/symbols.qml index e7deea0a..0d3d6a3e 100644 --- a/src/virtualkeyboard/content/layouts/fr_FR/symbols.qml +++ b/src/virtualkeyboard/content/layouts/fr_FR/symbols.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/hi_IN/main.qml b/src/virtualkeyboard/content/layouts/hi_IN/main.qml index 237049f7..aedf9882 100644 --- a/src/virtualkeyboard/content/layouts/hi_IN/main.qml +++ b/src/virtualkeyboard/content/layouts/hi_IN/main.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml b/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml index e1d59864..a7adefd7 100644 --- a/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml +++ b/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/it_IT/main.qml b/src/virtualkeyboard/content/layouts/it_IT/main.qml index 03cf08e8..a750cd65 100644 --- a/src/virtualkeyboard/content/layouts/it_IT/main.qml +++ b/src/virtualkeyboard/content/layouts/it_IT/main.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/it_IT/symbols.qml b/src/virtualkeyboard/content/layouts/it_IT/symbols.qml index e7deea0a..0d3d6a3e 100644 --- a/src/virtualkeyboard/content/layouts/it_IT/symbols.qml +++ b/src/virtualkeyboard/content/layouts/it_IT/symbols.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/nb_NO/main.qml b/src/virtualkeyboard/content/layouts/nb_NO/main.qml index 4019b8fa..183b9a2d 100644 --- a/src/virtualkeyboard/content/layouts/nb_NO/main.qml +++ b/src/virtualkeyboard/content/layouts/nb_NO/main.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/nb_NO/symbols.qml b/src/virtualkeyboard/content/layouts/nb_NO/symbols.qml index e7deea0a..0d3d6a3e 100644 --- a/src/virtualkeyboard/content/layouts/nb_NO/symbols.qml +++ b/src/virtualkeyboard/content/layouts/nb_NO/symbols.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/pl_PL/main.qml b/src/virtualkeyboard/content/layouts/pl_PL/main.qml index 9e667ef0..8d38cbfc 100644 --- a/src/virtualkeyboard/content/layouts/pl_PL/main.qml +++ b/src/virtualkeyboard/content/layouts/pl_PL/main.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/pl_PL/symbols.qml b/src/virtualkeyboard/content/layouts/pl_PL/symbols.qml index e7deea0a..0d3d6a3e 100644 --- a/src/virtualkeyboard/content/layouts/pl_PL/symbols.qml +++ b/src/virtualkeyboard/content/layouts/pl_PL/symbols.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/pt_PT/main.qml b/src/virtualkeyboard/content/layouts/pt_PT/main.qml index fd9b5cfa..c1a8aeb3 100644 --- a/src/virtualkeyboard/content/layouts/pt_PT/main.qml +++ b/src/virtualkeyboard/content/layouts/pt_PT/main.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/pt_PT/symbols.qml b/src/virtualkeyboard/content/layouts/pt_PT/symbols.qml index e7deea0a..0d3d6a3e 100644 --- a/src/virtualkeyboard/content/layouts/pt_PT/symbols.qml +++ b/src/virtualkeyboard/content/layouts/pt_PT/symbols.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/ru_RU/main.qml b/src/virtualkeyboard/content/layouts/ru_RU/main.qml index da52143c..d69d3ad9 100644 --- a/src/virtualkeyboard/content/layouts/ru_RU/main.qml +++ b/src/virtualkeyboard/content/layouts/ru_RU/main.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/ru_RU/symbols.qml b/src/virtualkeyboard/content/layouts/ru_RU/symbols.qml index 2917445c..29d7f5d4 100644 --- a/src/virtualkeyboard/content/layouts/ru_RU/symbols.qml +++ b/src/virtualkeyboard/content/layouts/ru_RU/symbols.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/sv_SE/main.qml b/src/virtualkeyboard/content/layouts/sv_SE/main.qml index 59210af2..7678fc44 100644 --- a/src/virtualkeyboard/content/layouts/sv_SE/main.qml +++ b/src/virtualkeyboard/content/layouts/sv_SE/main.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/sv_SE/symbols.qml b/src/virtualkeyboard/content/layouts/sv_SE/symbols.qml index e7deea0a..0d3d6a3e 100644 --- a/src/virtualkeyboard/content/layouts/sv_SE/symbols.qml +++ b/src/virtualkeyboard/content/layouts/sv_SE/symbols.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/zh_CN/main.qml b/src/virtualkeyboard/content/layouts/zh_CN/main.qml index b39871aa..a409bb0f 100644 --- a/src/virtualkeyboard/content/layouts/zh_CN/main.qml +++ b/src/virtualkeyboard/content/layouts/zh_CN/main.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayout { inputMethod: PinyinInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml b/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml index 1db934ed..f2b62e4b 100644 --- a/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml +++ b/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 KeyboardLayoutLoader { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/qmldir b/src/virtualkeyboard/content/qmldir index 00cdac40..37b8cd51 100644 --- a/src/virtualkeyboard/content/qmldir +++ b/src/virtualkeyboard/content/qmldir @@ -1,7 +1,9 @@ module QtQuick.Enterprise.VirtualKeyboard InputPanel 1.0 InputPanel.qml +InputPanel 1.2 InputPanel.qml BackspaceKey 1.0 components/BackspaceKey.qml BaseKey 1.0 components/BaseKey.qml +BaseKey 1.1 components/BaseKey.qml ChangeLanguageKey 1.0 components/ChangeLanguageKey.qml EnterKey 1.0 components/EnterKey.qml FillerKey 1.0 components/FillerKey.qml diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/virtualkeyboard/content/styles/default/style.qml index f86ef6d9..9dfad4a5 100644 --- a/src/virtualkeyboard/content/styles/default/style.qml +++ b/src/virtualkeyboard/content/styles/default/style.qml @@ -17,8 +17,8 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 -import QtQuick.Enterprise.VirtualKeyboard.Styles 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 +import QtQuick.Enterprise.VirtualKeyboard.Styles 1.2 KeyboardStyle { readonly property bool pinyinMode: InputContext.inputEngine.inputMode === InputEngine.Pinyin diff --git a/src/virtualkeyboard/content/styles/retro/style.qml b/src/virtualkeyboard/content/styles/retro/style.qml index 0b05e778..ca71822f 100644 --- a/src/virtualkeyboard/content/styles/retro/style.qml +++ b/src/virtualkeyboard/content/styles/retro/style.qml @@ -17,8 +17,8 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 -import QtQuick.Enterprise.VirtualKeyboard.Styles 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 +import QtQuick.Enterprise.VirtualKeyboard.Styles 1.2 KeyboardStyle { readonly property bool pinyinMode: InputContext.inputEngine.inputMode === InputEngine.Pinyin diff --git a/src/virtualkeyboard/declarativeinputcontext.cpp b/src/virtualkeyboard/declarativeinputcontext.cpp index c30ed34c..3f78c783 100644 --- a/src/virtualkeyboard/declarativeinputcontext.cpp +++ b/src/virtualkeyboard/declarativeinputcontext.cpp @@ -33,7 +33,7 @@ #endif /*! - \qmlmodule QtQuick.Enterprise.VirtualKeyboard 1.1 + \qmlmodule QtQuick.Enterprise.VirtualKeyboard 1.2 This module provides a collection of QML components for Qt Virtual Keyboard. */ diff --git a/src/virtualkeyboard/declarativesettings.cpp b/src/virtualkeyboard/declarativesettings.cpp index fc932764..fa39700c 100644 --- a/src/virtualkeyboard/declarativesettings.cpp +++ b/src/virtualkeyboard/declarativesettings.cpp @@ -72,7 +72,7 @@ public: }; /*! - \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Settings 1.0 + \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Settings 1.2 This module provides settings components for Qt Virtual Keyboard. */ diff --git a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf index e5902159..7b977ef0 100644 --- a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf +++ b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf @@ -7,7 +7,7 @@ include($QT_INSTALL_DOCS/global/qt-cpp-defines.qdocconf) project = QtVirtualKeyboard description = Qt Virtual Keyboard -version = 1.1 +version = 1.2 headerdirs += .. sourcedirs += .. @@ -27,14 +27,14 @@ depends += qtcore qtgui qtquick qhp.projects = QtVirtualKeyboard qhp.QtVirtualKeyboard.file = qtvirtualkeyboard.qhp -qhp.QtVirtualKeyboard.namespace = com.digia.qtvirtualkeyboard.110 +qhp.QtVirtualKeyboard.namespace = com.digia.qtvirtualkeyboard.120 qhp.QtVirtualKeyboard.virtualFolder = qtvirtualkeyboard qhp.QtVirtualKeyboard.indexTitle = Qt Virtual Keyboard qhp.QtVirtualKeyboard.indexRoot = -qhp.QtVirtualKeyboard.filterAttributes = qtvirtualkeyboard 1.1 qtrefdoc -qhp.QtVirtualKeyboard.customFilters.Qt.name = QtVirtualKeyboard 1.1 -qhp.QtVirtualKeyboard.customFilters.Qt.filterAttributes = qtvirtualkeyboard 1.1 +qhp.QtVirtualKeyboard.filterAttributes = qtvirtualkeyboard 1.2 qtrefdoc +qhp.QtVirtualKeyboard.customFilters.Qt.name = QtVirtualKeyboard 1.2 +qhp.QtVirtualKeyboard.customFilters.Qt.filterAttributes = qtvirtualkeyboard 1.2 qhp.QtVirtualKeyboard.subprojects = classes qmltypes examples diff --git a/src/virtualkeyboard/doc/src/deployment-guide.qdoc b/src/virtualkeyboard/doc/src/deployment-guide.qdoc index db7ad6d1..fc66b1aa 100644 --- a/src/virtualkeyboard/doc/src/deployment-guide.qdoc +++ b/src/virtualkeyboard/doc/src/deployment-guide.qdoc @@ -106,7 +106,7 @@ divide the screen area with the application container. \code import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.1 +import QtQuick.Enterprise.VirtualKeyboard 1.2 Item { id: root diff --git a/src/virtualkeyboard/doc/src/technical-guide.qdoc b/src/virtualkeyboard/doc/src/technical-guide.qdoc index 14946cb7..f4874606 100644 --- a/src/virtualkeyboard/doc/src/technical-guide.qdoc +++ b/src/virtualkeyboard/doc/src/technical-guide.qdoc @@ -335,7 +335,7 @@ For example, to add a regular key which sends a key event to the input method: \code import QtQuick 2.0 import QtQuick.Layouts 1.0 - import QtQuick.Enterprise.VirtualKeyboard 1.1 + import QtQuick.Enterprise.VirtualKeyboard 1.2 // file: layouts/en_GB/main.qml @@ -368,7 +368,7 @@ example, we add another key which specifies a custom key weight: \code import QtQuick 2.0 import QtQuick.Layouts 1.0 - import QtQuick.Enterprise.VirtualKeyboard 1.1 + import QtQuick.Enterprise.VirtualKeyboard 1.2 // file: layouts/en_GB/main.qml @@ -426,7 +426,7 @@ For example: \code import QtQuick 2.0 import QtQuick.Layouts 1.0 - import QtQuick.Enterprise.VirtualKeyboard 1.1 + import QtQuick.Enterprise.VirtualKeyboard 1.2 // file: layouts/en_GB/symbols.qml diff --git a/src/virtualkeyboard/plugin.cpp b/src/virtualkeyboard/plugin.cpp index 30e59132..882e3c06 100644 --- a/src/virtualkeyboard/plugin.cpp +++ b/src/virtualkeyboard/plugin.cpp @@ -74,14 +74,16 @@ QPlatformInputContext *PlatformInputContextPlugin::create(const QString &system, #endif qmlRegisterType<EnterKeyActionAttachedType>(); qmlRegisterType<EnterKeyAction>("QtQuick.Enterprise.VirtualKeyboard", 1, 0, "EnterKeyAction"); - qmlRegisterSingletonType<DeclarativeSettings>("QtQuick.Enterprise.VirtualKeyboard.Settings", 1, 0, "VirtualKeyboardSettings", DeclarativeSettings::registerSettingsModule); + qmlRegisterSingletonType<DeclarativeSettings>("QtQuick.Enterprise.VirtualKeyboard.Settings", 1, 2, "VirtualKeyboardSettings", DeclarativeSettings::registerSettingsModule); qmlRegisterType(QUrl(path + "InputPanel.qml"), "QtQuick.Enterprise.VirtualKeyboard", 1, 0, "InputPanel"); + qmlRegisterType(QUrl(path + "InputPanel.qml"), "QtQuick.Enterprise.VirtualKeyboard", 1, 2, "InputPanel"); const QString componentsPath = path + QLatin1Literal("components/"); qmlRegisterType(QUrl(componentsPath + "AlternativeKeys.qml"), "QtQuick.Enterprise.VirtualKeyboard", 1, 0, "AlternativeKeys"); qmlRegisterType(QUrl(componentsPath + "AutoScroller.qml"), "QtQuick.Enterprise.VirtualKeyboard", 1, 0, "AutoScroller"); qmlRegisterType(QUrl(componentsPath + "BackspaceKey.qml"), "QtQuick.Enterprise.VirtualKeyboard", 1, 0, "BackspaceKey"); qmlRegisterType(QUrl(componentsPath + "BaseKey.qml"), "QtQuick.Enterprise.VirtualKeyboard", 1, 0, "BaseKey"); + qmlRegisterType(QUrl(componentsPath + "BaseKey.qml"), "QtQuick.Enterprise.VirtualKeyboard", 1, 1, "BaseKey"); qmlRegisterType(QUrl(componentsPath + "ChangeLanguageKey.qml"), "QtQuick.Enterprise.VirtualKeyboard", 1, 0, "ChangeLanguageKey"); qmlRegisterType(QUrl(componentsPath + "CharacterPreviewBubble.qml"), "QtQuick.Enterprise.VirtualKeyboard", 1, 0, "CharacterPreviewBubble"); qmlRegisterType(QUrl(componentsPath + "EnterKey.qml"), "QtQuick.Enterprise.VirtualKeyboard", 1, 0, "EnterKey"); diff --git a/src/virtualkeyboard/styles/qmldir b/src/virtualkeyboard/styles/qmldir index 26b64ba5..24246c4a 100644 --- a/src/virtualkeyboard/styles/qmldir +++ b/src/virtualkeyboard/styles/qmldir @@ -2,6 +2,7 @@ module QtQuick.Enterprise.VirtualKeyboard.Styles plugin qtvirtualkeyboardstylesplugin KeyboardStyle 1.0 KeyboardStyle.qml KeyboardStyle 1.1 KeyboardStyle.qml +KeyboardStyle 1.2 KeyboardStyle.qml KeyPanel 1.0 KeyPanel.qml KeyPanel 1.1 KeyPanel.qml KeyIcon 1.0 KeyIcon.qml diff --git a/src/virtualkeyboard/styles/styles_plugin.cpp b/src/virtualkeyboard/styles/styles_plugin.cpp index 0a1f6165..a06e8995 100644 --- a/src/virtualkeyboard/styles/styles_plugin.cpp +++ b/src/virtualkeyboard/styles/styles_plugin.cpp @@ -21,7 +21,7 @@ #include <qqml.h> /*! - \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles 1.1 + \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles 1.2 This module provides styling components for the Qt Virtual Keyboard. */ @@ -34,6 +34,7 @@ void StylesPlugin::registerTypes(const char *uri) const QString path(STYLES_IMPORT_PATH); qmlRegisterType(QUrl(path + "KeyboardStyle.qml"), uri, 1, 0, "KeyboardStyle"); qmlRegisterType(QUrl(path + "KeyboardStyle.qml"), uri, 1, 1, "KeyboardStyle"); + qmlRegisterType(QUrl(path + "KeyboardStyle.qml"), uri, 1, 2, "KeyboardStyle"); qmlRegisterType(QUrl(path + "KeyIcon.qml"), uri, 1, 0, "KeyIcon"); qmlRegisterType(QUrl(path + "KeyPanel.qml"), uri, 1, 0, "KeyPanel"); qmlRegisterType(QUrl(path + "SelectionListItem.qml"), uri, 1, 0, "SelectionListItem"); |