From d09581b345bebb4fd10fb999aa2cc3873b4af92f Mon Sep 17 00:00:00 2001 From: Jarkko Koivikko Date: Thu, 26 Feb 2015 12:24:56 +0200 Subject: Update version number to 1.3 Change-Id: I030e6a29d7e862c575e658a87aa8c22a268cfedb Reviewed-by: Caroline Chao Reviewed-by: Mitch Curtis --- .qmake.conf | 2 +- .../virtualkeyboard/VirtualKeyboard-b2qt.qml | 2 +- .../virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml | 2 +- .../virtualkeyboard/virtualkeyboard/content/TextArea.qml | 2 +- .../virtualkeyboard/virtualkeyboard/content/TextBase.qml | 2 +- .../virtualkeyboard/virtualkeyboard/content/TextField.qml | 2 +- src/virtualkeyboard/content/InputPanel.qml | 2 +- src/virtualkeyboard/content/components/AlternativeKeys.qml | 2 +- src/virtualkeyboard/content/components/AutoScroller.qml | 2 +- src/virtualkeyboard/content/components/EnterKey.qml | 2 +- src/virtualkeyboard/content/components/HideKeyboardKey.qml | 2 +- src/virtualkeyboard/content/components/Keyboard.qml | 10 +++++----- src/virtualkeyboard/content/components/KeyboardLayout.qml | 4 ++-- .../content/components/KeyboardLayoutLoader.qml | 2 +- .../content/components/MultitapInputMethod.qml | 2 +- src/virtualkeyboard/content/components/ShiftKey.qml | 2 +- src/virtualkeyboard/content/layouts/ar_AR/digits.qml | 2 +- src/virtualkeyboard/content/layouts/ar_AR/main.qml | 2 +- src/virtualkeyboard/content/layouts/ar_AR/numbers.qml | 2 +- src/virtualkeyboard/content/layouts/ar_AR/symbols.qml | 2 +- src/virtualkeyboard/content/layouts/da_DK/main.qml | 2 +- src/virtualkeyboard/content/layouts/da_DK/symbols.qml | 2 +- src/virtualkeyboard/content/layouts/de_DE/main.qml | 2 +- src/virtualkeyboard/content/layouts/de_DE/symbols.qml | 2 +- src/virtualkeyboard/content/layouts/en_GB/dialpad.qml | 2 +- src/virtualkeyboard/content/layouts/en_GB/digits.qml | 2 +- src/virtualkeyboard/content/layouts/en_GB/main.qml | 2 +- src/virtualkeyboard/content/layouts/en_GB/numbers.qml | 2 +- src/virtualkeyboard/content/layouts/en_GB/symbols.qml | 2 +- src/virtualkeyboard/content/layouts/es_ES/main.qml | 2 +- src/virtualkeyboard/content/layouts/es_ES/symbols.qml | 2 +- src/virtualkeyboard/content/layouts/fa_FA/digits.qml | 2 +- src/virtualkeyboard/content/layouts/fa_FA/main.qml | 2 +- src/virtualkeyboard/content/layouts/fa_FA/numbers.qml | 2 +- src/virtualkeyboard/content/layouts/fa_FA/symbols.qml | 2 +- src/virtualkeyboard/content/layouts/fi_FI/main.qml | 2 +- src/virtualkeyboard/content/layouts/fi_FI/symbols.qml | 2 +- src/virtualkeyboard/content/layouts/fr_FR/main.qml | 2 +- src/virtualkeyboard/content/layouts/fr_FR/symbols.qml | 2 +- src/virtualkeyboard/content/layouts/hi_IN/main.qml | 2 +- src/virtualkeyboard/content/layouts/hi_IN/symbols.qml | 2 +- src/virtualkeyboard/content/layouts/it_IT/main.qml | 2 +- src/virtualkeyboard/content/layouts/it_IT/symbols.qml | 2 +- src/virtualkeyboard/content/layouts/ja_JP/main.qml | 4 ++-- src/virtualkeyboard/content/layouts/ja_JP/symbols.qml | 4 ++-- src/virtualkeyboard/content/layouts/ko_KR/main.qml | 4 ++-- src/virtualkeyboard/content/layouts/ko_KR/symbols.qml | 4 ++-- src/virtualkeyboard/content/layouts/nb_NO/main.qml | 2 +- src/virtualkeyboard/content/layouts/nb_NO/symbols.qml | 2 +- src/virtualkeyboard/content/layouts/pl_PL/main.qml | 2 +- src/virtualkeyboard/content/layouts/pl_PL/symbols.qml | 2 +- src/virtualkeyboard/content/layouts/pt_PT/main.qml | 2 +- src/virtualkeyboard/content/layouts/pt_PT/symbols.qml | 2 +- src/virtualkeyboard/content/layouts/ru_RU/main.qml | 2 +- src/virtualkeyboard/content/layouts/ru_RU/symbols.qml | 2 +- src/virtualkeyboard/content/layouts/sv_SE/main.qml | 2 +- src/virtualkeyboard/content/layouts/sv_SE/symbols.qml | 2 +- src/virtualkeyboard/content/layouts/zh_CN/main.qml | 4 ++-- src/virtualkeyboard/content/layouts/zh_CN/symbols.qml | 4 ++-- src/virtualkeyboard/content/styles/default/style.qml | 4 ++-- src/virtualkeyboard/content/styles/retro/style.qml | 4 ++-- src/virtualkeyboard/declarativeinputcontext.cpp | 2 +- src/virtualkeyboard/declarativesettings.cpp | 2 +- src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf | 10 +++++----- src/virtualkeyboard/doc/src/deployment-guide.qdoc | 2 +- src/virtualkeyboard/doc/src/technical-guide.qdoc | 6 +++--- src/virtualkeyboard/plugin.cpp | 14 ++++++-------- src/virtualkeyboard/styles/styles_plugin.cpp | 7 +++---- tests/auto/inputpanel/data/inputpanel/inputpanel.qml | 4 ++-- 69 files changed, 96 insertions(+), 99 deletions(-) diff --git a/.qmake.conf b/.qmake.conf index 96e2de20..bb0dd7f1 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 1.2 +MODULE_VERSION = 1.3 diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard-b2qt.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard-b2qt.qml index 26412d0c..783dbe01 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard-b2qt.qml +++ b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard-b2qt.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Window 2.2 -import QtQuick.Enterprise.VirtualKeyboard 1.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 Item { implicitWidth: virtualKeyboard.implicitHeight diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml index 2a02f1a4..ae63b8c1 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml +++ b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 import "content" Rectangle { diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml index 763f3534..2b366c5c 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml +++ b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 TextBase { id: textArea diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml index 048a97b8..d68e00a2 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml +++ b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 FocusScope { id: textBase diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml index 7a3aa041..513bc942 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml +++ b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 TextBase { id: textField diff --git a/src/virtualkeyboard/content/InputPanel.qml b/src/virtualkeyboard/content/InputPanel.qml index ea02a2b9..de293171 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 /*! \qmltype InputPanel diff --git a/src/virtualkeyboard/content/components/AlternativeKeys.qml b/src/virtualkeyboard/content/components/AlternativeKeys.qml index f72481af..9375d4d0 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 Item { property bool active: listView.currentIndex != -1 diff --git a/src/virtualkeyboard/content/components/AutoScroller.qml b/src/virtualkeyboard/content/components/AutoScroller.qml index c491dcc1..fcb03a4e 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 Item { diff --git a/src/virtualkeyboard/content/components/EnterKey.qml b/src/virtualkeyboard/content/components/EnterKey.qml index bde61e6f..55a57386 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 /*! \qmltype EnterKey diff --git a/src/virtualkeyboard/content/components/HideKeyboardKey.qml b/src/virtualkeyboard/content/components/HideKeyboardKey.qml index 7630f56d..fac42081 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 /*! \qmltype HideKeyboardKey diff --git a/src/virtualkeyboard/content/components/Keyboard.qml b/src/virtualkeyboard/content/components/Keyboard.qml index 85af3038..baca7347 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.2 -import QtQuick.Enterprise.VirtualKeyboard.Styles 1.2 -import QtQuick.Enterprise.VirtualKeyboard.Settings 1.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 +import QtQuick.Enterprise.VirtualKeyboard.Styles 1.3 +import QtQuick.Enterprise.VirtualKeyboard.Settings 1.3 import Qt.labs.folderlistmodel 2.0 Item { @@ -59,7 +59,7 @@ Item { function initDefaultInputMethod() { try { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.2; HunspellInputMethod {}', keyboard, "defaultInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.3; HunspellInputMethod {}', keyboard, "defaultInputMethod") } catch (e) { } return plainInputMethod } @@ -508,7 +508,7 @@ Item { var soundId = Qt.md5(sound) multiSoundEffect = __sounds[soundId] if (!multiSoundEffect) { - multiSoundEffect = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.2; MultiSoundEffect {}', soundEffect) + multiSoundEffect = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.3; MultiSoundEffect {}', soundEffect) if (multiSoundEffect) { multiSoundEffect.playingChanged.connect(soundEffect.playingChanged) multiSoundEffect.source = sound diff --git a/src/virtualkeyboard/content/components/KeyboardLayout.qml b/src/virtualkeyboard/content/components/KeyboardLayout.qml index bd56cbb8..4e0497f3 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 /*! \qmltype KeyboardLayout @@ -36,7 +36,7 @@ import QtQuick.Enterprise.VirtualKeyboard 1.2 \code import QtQuick 2.0 import QtQuick.Layouts 1.0 - import QtQuick.Enterprise.VirtualKeyboard 1.2 + import QtQuick.Enterprise.VirtualKeyboard 1.3 // file: layouts/en_GB/main.qml diff --git a/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml b/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml index a7d94b3a..6ecf2358 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.2 + import QtQuick.Enterprise.VirtualKeyboard 1.3 // file: layouts/en_GB/symbols.qml diff --git a/src/virtualkeyboard/content/components/MultitapInputMethod.qml b/src/virtualkeyboard/content/components/MultitapInputMethod.qml index 98b9c78c..f78d7dd7 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 InputMethod { property string multitapSequence diff --git a/src/virtualkeyboard/content/components/ShiftKey.qml b/src/virtualkeyboard/content/components/ShiftKey.qml index 9300264d..a1b953a5 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 /*! \qmltype ShiftKey diff --git a/src/virtualkeyboard/content/layouts/ar_AR/digits.qml b/src/virtualkeyboard/content/layouts/ar_AR/digits.qml index 1cfedf2e..84bd696d 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/ar_AR/main.qml b/src/virtualkeyboard/content/layouts/ar_AR/main.qml index c778832d..0b41aaae 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 942def32..fd5723c5 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml b/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml index face9b7e..c31afb00 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 d1859e6b..04f11d1f 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 6b054ae6..6cdd4871 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 f39d1ba1..312fdce7 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 6b054ae6..6cdd4871 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 bcdf2f7f..a504a898 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/en_GB/digits.qml b/src/virtualkeyboard/content/layouts/en_GB/digits.qml index fbff7492..9b118b1c 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/en_GB/main.qml b/src/virtualkeyboard/content/layouts/en_GB/main.qml index bb379f67..6c0e84aa 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 f0cf6064..cd7e9277 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/en_GB/symbols.qml b/src/virtualkeyboard/content/layouts/en_GB/symbols.qml index 6b054ae6..6cdd4871 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 df92e10f..9ed48182 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 898306ec..3e2a658b 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 d9952a3a..df60fd2a 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/fa_FA/main.qml b/src/virtualkeyboard/content/layouts/fa_FA/main.qml index 3f81d7fc..8f15d56b 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 4e438036..b4763120 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml b/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml index 4677d15c..a91ee169 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 1235fa99..93700a06 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 6b054ae6..6cdd4871 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 32e9b2f1..e72e6e60 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 6b054ae6..6cdd4871 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 eb9da40c..d3b61cce 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 bf28b77f..d9cede65 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 19028c7f..97bc9b24 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 6b054ae6..6cdd4871 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/ja_JP/main.qml b/src/virtualkeyboard/content/layouts/ja_JP/main.qml index b10ecaf0..5f7078e8 100644 --- a/src/virtualkeyboard/content/layouts/ja_JP/main.qml +++ b/src/virtualkeyboard/content/layouts/ja_JP/main.qml @@ -17,11 +17,11 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.2; JapaneseInputMethod {}', parent, "japaneseInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.3; JapaneseInputMethod {}', parent, "japaneseInputMethod") } sourceComponent: InputContext.inputEngine.inputMode === InputEngine.FullwidthLatin ? page2 : page1 Component { diff --git a/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml b/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml index d4a10b41..5b811196 100644 --- a/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml +++ b/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml @@ -18,11 +18,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.2; JapaneseInputMethod {}', parent, "japaneseInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.3; JapaneseInputMethod {}', parent, "japaneseInputMethod") } property int page readonly property int numPages: 3 diff --git a/src/virtualkeyboard/content/layouts/ko_KR/main.qml b/src/virtualkeyboard/content/layouts/ko_KR/main.qml index ecf1e7b8..e5c25863 100644 --- a/src/virtualkeyboard/content/layouts/ko_KR/main.qml +++ b/src/virtualkeyboard/content/layouts/ko_KR/main.qml @@ -17,11 +17,11 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.2; HangulInputMethod {}', parent, "hangulInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.3; HangulInputMethod {}', parent, "hangulInputMethod") } sourceComponent: InputContext.shift || InputContext.capsLock ? page2 : page1 Component { diff --git a/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml b/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml index 7ebc7b55..392bbdf8 100644 --- a/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml +++ b/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml @@ -18,11 +18,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.2; HangulInputMethod {}', parent, "hangulInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.3; HangulInputMethod {}', parent, "hangulInputMethod") } property bool secondPage onVisibleChanged: if (!visible) secondPage = false diff --git a/src/virtualkeyboard/content/layouts/nb_NO/main.qml b/src/virtualkeyboard/content/layouts/nb_NO/main.qml index 2736e8b6..8fbae9b8 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 6b054ae6..6cdd4871 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 60c31bef..a29bf506 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 6b054ae6..6cdd4871 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 bd62d4d6..1ca0b129 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 6b054ae6..6cdd4871 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 309c0efe..cf15fdce 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 4f294848..1866e26b 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 1235fa99..93700a06 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 6b054ae6..6cdd4871 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 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 3ec374ba..eef1b4b1 100644 --- a/src/virtualkeyboard/content/layouts/zh_CN/main.qml +++ b/src/virtualkeyboard/content/layouts/zh_CN/main.qml @@ -18,11 +18,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.2; PinyinInputMethod {}', parent, "pinyinInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.3; PinyinInputMethod {}', parent, "pinyinInputMethod") } keyWeight: 160 KeyboardRow { diff --git a/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml b/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml index d4adf360..3944b164 100644 --- a/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml +++ b/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml @@ -18,11 +18,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 1.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.2; PinyinInputMethod {}', parent, "pinyinInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.3; PinyinInputMethod {}', parent, "pinyinInputMethod") } property int page readonly property int numPages: 3 diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/virtualkeyboard/content/styles/default/style.qml index 7167dc42..7229eb08 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.2 -import QtQuick.Enterprise.VirtualKeyboard.Styles 1.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 +import QtQuick.Enterprise.VirtualKeyboard.Styles 1.3 KeyboardStyle { id: currentStyle diff --git a/src/virtualkeyboard/content/styles/retro/style.qml b/src/virtualkeyboard/content/styles/retro/style.qml index 2ea89153..a7fac9c5 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.2 -import QtQuick.Enterprise.VirtualKeyboard.Styles 1.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 +import QtQuick.Enterprise.VirtualKeyboard.Styles 1.3 KeyboardStyle { id: currentStyle diff --git a/src/virtualkeyboard/declarativeinputcontext.cpp b/src/virtualkeyboard/declarativeinputcontext.cpp index a511ee8e..8e740039 100644 --- a/src/virtualkeyboard/declarativeinputcontext.cpp +++ b/src/virtualkeyboard/declarativeinputcontext.cpp @@ -32,7 +32,7 @@ #endif /*! - \qmlmodule QtQuick.Enterprise.VirtualKeyboard 1.2 + \qmlmodule QtQuick.Enterprise.VirtualKeyboard 1.3 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 a6006fa7..530fa833 100644 --- a/src/virtualkeyboard/declarativesettings.cpp +++ b/src/virtualkeyboard/declarativesettings.cpp @@ -76,7 +76,7 @@ public: }; /*! - \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Settings 1.2 + \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Settings 1.3 This module provides settings components for Qt Virtual Keyboard. */ diff --git a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf index 7b977ef0..538e2d22 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.2 +version = 1.3 headerdirs += .. sourcedirs += .. @@ -27,14 +27,14 @@ depends += qtcore qtgui qtquick qhp.projects = QtVirtualKeyboard qhp.QtVirtualKeyboard.file = qtvirtualkeyboard.qhp -qhp.QtVirtualKeyboard.namespace = com.digia.qtvirtualkeyboard.120 +qhp.QtVirtualKeyboard.namespace = com.digia.qtvirtualkeyboard.130 qhp.QtVirtualKeyboard.virtualFolder = qtvirtualkeyboard qhp.QtVirtualKeyboard.indexTitle = Qt Virtual Keyboard qhp.QtVirtualKeyboard.indexRoot = -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.filterAttributes = qtvirtualkeyboard 1.3 qtrefdoc +qhp.QtVirtualKeyboard.customFilters.Qt.name = QtVirtualKeyboard 1.3 +qhp.QtVirtualKeyboard.customFilters.Qt.filterAttributes = qtvirtualkeyboard 1.3 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 f3e1ba66..206c4078 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.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 Item { id: root diff --git a/src/virtualkeyboard/doc/src/technical-guide.qdoc b/src/virtualkeyboard/doc/src/technical-guide.qdoc index 8d27944e..ba9224d3 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.2 + import QtQuick.Enterprise.VirtualKeyboard 1.3 // 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.2 + import QtQuick.Enterprise.VirtualKeyboard 1.3 // 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.2 + import QtQuick.Enterprise.VirtualKeyboard 1.3 // file: layouts/en_GB/symbols.qml diff --git a/src/virtualkeyboard/plugin.cpp b/src/virtualkeyboard/plugin.cpp index 50be714a..dff732d6 100644 --- a/src/virtualkeyboard/plugin.cpp +++ b/src/virtualkeyboard/plugin.cpp @@ -73,26 +73,24 @@ QPlatformInputContext *PlatformInputContextPlugin::create(const QString &system, qmlRegisterType("QtQuick.Enterprise.VirtualKeyboard", 1, 1, "PinyinInputMethod"); #endif #ifdef HAVE_HANGUL - // TODO: Added in version 1.3 - qmlRegisterType("QtQuick.Enterprise.VirtualKeyboard", 1, 2, "HangulInputMethod"); + qmlRegisterType("QtQuick.Enterprise.VirtualKeyboard", 1, 3, "HangulInputMethod"); #endif #ifdef HAVE_OPENWNN - // TODO: Added in version 1.3 - qmlRegisterType("QtQuick.Enterprise.VirtualKeyboard", 1, 2, "JapaneseInputMethod"); + qmlRegisterType("QtQuick.Enterprise.VirtualKeyboard", 1, 3, "JapaneseInputMethod"); #endif qmlRegisterType(); qmlRegisterType("QtQuick.Enterprise.VirtualKeyboard", 1, 0, "EnterKeyAction"); - qmlRegisterSingletonType("QtQuick.Enterprise.VirtualKeyboard.Settings", 1, 2, "VirtualKeyboardSettings", DeclarativeSettings::registerSettingsModule); + // NOTE: The Settings component version follows the VirtualKeyboard version + qmlRegisterSingletonType("QtQuick.Enterprise.VirtualKeyboard.Settings", 1, 3, "VirtualKeyboardSettings", DeclarativeSettings::registerSettingsModule); const QString path("qrc:///content/"); - qmlRegisterType(QUrl(path + "InputPanel.qml"), "QtQuick.Enterprise.VirtualKeyboard", 1, 0, "InputPanel"); - qmlRegisterType(QUrl(path + "InputPanel.qml"), "QtQuick.Enterprise.VirtualKeyboard", 1, 2, "InputPanel"); + // NOTE: The InputPanel component version follows the VirtualKeyboard version + qmlRegisterType(QUrl(path + "InputPanel.qml"), "QtQuick.Enterprise.VirtualKeyboard", 1, 3, "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/styles_plugin.cpp b/src/virtualkeyboard/styles/styles_plugin.cpp index 0676abee..a1a7ac29 100644 --- a/src/virtualkeyboard/styles/styles_plugin.cpp +++ b/src/virtualkeyboard/styles/styles_plugin.cpp @@ -22,7 +22,7 @@ #include /*! - \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles 1.2 + \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles 1.3 This module provides styling components for the Qt Virtual Keyboard. */ @@ -31,9 +31,8 @@ void StylesPlugin::registerTypes(const char *uri) { Q_INIT_RESOURCE(styles); const QString path("qrc:///content/styles/"); - 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"); + // NOTE: The KeyboardStyle component version follows the VirtualKeyboard version + qmlRegisterType(QUrl(path + "KeyboardStyle.qml"), uri, 1, 3, "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"); diff --git a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml index 1db94c67..80901bbb 100644 --- a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml +++ b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml @@ -18,8 +18,8 @@ import QtTest 1.0 import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.2 -import QtQuick.Enterprise.VirtualKeyboard.Settings 1.2 +import QtQuick.Enterprise.VirtualKeyboard 1.3 +import QtQuick.Enterprise.VirtualKeyboard.Settings 1.3 InputPanel { id: inputPanel -- cgit v1.2.3