From 0cc1aadcd1452b8290d7b9f18d88019f2435a95b Mon Sep 17 00:00:00 2001
From: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Date: Thu, 27 Aug 2015 11:36:09 +0300
Subject: [PATCH] Update version number to 2.0
Handwriting support was originally added as 1.4, but has been
updated to 2.0 in this commit.
Since the major version number has changed, all the components
must be registered with the new major version number.
Change-Id: I34c74f5dd24684423d153ff85a4a24eed8d4ffd1
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
---
.../virtualkeyboard/VirtualKeyboard-b2qt.qml | 2 +-
.../virtualkeyboard/VirtualKeyboard.qml | 2 +-
.../virtualkeyboard/content/TextArea.qml | 2 +-
.../virtualkeyboard/content/TextBase.qml | 2 +-
.../virtualkeyboard/content/TextField.qml | 2 +-
src/virtualkeyboard/abstractinputmethod.cpp | 6 +--
src/virtualkeyboard/content/InputPanel.qml | 2 +-
.../content/components/AlternativeKeys.qml | 2 +-
.../content/components/AutoScroller.qml | 2 +-
.../content/components/EnterKey.qml | 2 +-
.../content/components/HandwritingModeKey.qml | 2 +-
.../content/components/HideKeyboardKey.qml | 2 +-
.../content/components/Keyboard.qml | 8 ++--
.../content/components/KeyboardLayout.qml | 4 +-
.../components/KeyboardLayoutLoader.qml | 2 +-
.../components/MultitapInputMethod.qml | 2 +-
.../content/components/ShiftKey.qml | 2 +-
.../content/components/TraceInputArea.qml | 4 +-
.../content/components/TraceInputKey.qml | 2 +-
.../content/layouts/ar_AR/digits.qml | 2 +-
.../content/layouts/ar_AR/main.qml | 2 +-
.../content/layouts/ar_AR/numbers.qml | 2 +-
.../content/layouts/ar_AR/symbols.qml | 2 +-
.../content/layouts/da_DK/main.qml | 2 +-
.../content/layouts/da_DK/symbols.qml | 2 +-
.../content/layouts/de_DE/main.qml | 2 +-
.../content/layouts/de_DE/symbols.qml | 2 +-
.../content/layouts/en_GB/dialpad.qml | 2 +-
.../content/layouts/en_GB/digits.qml | 2 +-
.../content/layouts/en_GB/handwriting.qml | 4 +-
.../content/layouts/en_GB/main.qml | 2 +-
.../content/layouts/en_GB/numbers.qml | 2 +-
.../content/layouts/en_GB/symbols.qml | 2 +-
.../content/layouts/es_ES/main.qml | 2 +-
.../content/layouts/es_ES/symbols.qml | 2 +-
.../content/layouts/fa_FA/digits.qml | 2 +-
.../content/layouts/fa_FA/main.qml | 2 +-
.../content/layouts/fa_FA/numbers.qml | 2 +-
.../content/layouts/fa_FA/symbols.qml | 2 +-
.../content/layouts/fi_FI/main.qml | 2 +-
.../content/layouts/fi_FI/symbols.qml | 2 +-
.../content/layouts/fr_FR/main.qml | 2 +-
.../content/layouts/fr_FR/symbols.qml | 2 +-
.../content/layouts/hi_IN/main.qml | 2 +-
.../content/layouts/hi_IN/symbols.qml | 2 +-
.../content/layouts/it_IT/main.qml | 2 +-
.../content/layouts/it_IT/symbols.qml | 2 +-
.../content/layouts/ja_JP/main.qml | 4 +-
.../content/layouts/ja_JP/symbols.qml | 4 +-
.../content/layouts/ko_KR/main.qml | 4 +-
.../content/layouts/ko_KR/symbols.qml | 4 +-
.../content/layouts/nb_NO/main.qml | 2 +-
.../content/layouts/nb_NO/symbols.qml | 2 +-
.../content/layouts/pl_PL/main.qml | 2 +-
.../content/layouts/pl_PL/symbols.qml | 2 +-
.../content/layouts/pt_PT/main.qml | 2 +-
.../content/layouts/pt_PT/symbols.qml | 2 +-
.../content/layouts/ru_RU/main.qml | 2 +-
.../content/layouts/ru_RU/symbols.qml | 2 +-
.../content/layouts/sv_SE/main.qml | 2 +-
.../content/layouts/sv_SE/symbols.qml | 2 +-
.../content/layouts/zh_CN/main.qml | 4 +-
.../content/layouts/zh_CN/symbols.qml | 4 +-
.../content/styles/default/style.qml | 4 +-
.../content/styles/retro/style.qml | 4 +-
.../declarativeinputcontext.cpp | 2 +-
.../declarativeinputengine.cpp | 12 +++---
.../declarativeinputmethod.cpp | 6 +--
src/virtualkeyboard/declarativetrace.cpp | 4 +-
.../doc/src/deployment-guide.qdoc | 2 +-
.../doc/src/technical-guide.qdoc | 8 ++--
src/virtualkeyboard/plugin.cpp | 43 ++++++++++++++++---
src/virtualkeyboard/styles/KeyboardStyle.qml | 4 +-
src/virtualkeyboard/styles/TraceCanvas.qml | 2 +-
.../styles/TraceInputKeyPanel.qml | 2 +-
src/virtualkeyboard/styles/styles_plugin.cpp | 10 +++--
.../inputpanel/data/inputpanel/inputpanel.qml | 2 +-
tests/auto/inputpanel/data/tst_inputpanel.qml | 6 +++
78 files changed, 154 insertions(+), 111 deletions(-)
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard-b2qt.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard-b2qt.qml
index 783dbe01..2843f89f 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
Item {
implicitWidth: virtualKeyboard.implicitHeight
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml
index ae63b8c1..1f0d4670 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
import "content"
Rectangle {
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml
index 2b366c5c..38915479 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
TextBase {
id: textArea
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml
index d68e00a2..1b79a90a 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
FocusScope {
id: textBase
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml
index 513bc942..51fe490a 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
TextBase {
id: textField
diff --git a/src/virtualkeyboard/abstractinputmethod.cpp b/src/virtualkeyboard/abstractinputmethod.cpp
index 88468a60..19ff910e 100644
--- a/src/virtualkeyboard/abstractinputmethod.cpp
+++ b/src/virtualkeyboard/abstractinputmethod.cpp
@@ -148,7 +148,7 @@ void AbstractInputMethod::selectionListItemSelected(DeclarativeSelectionListMode
}
/*!
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
Returns list of supported pattern recognition modes.
@@ -161,7 +161,7 @@ QList<DeclarativeInputEngine::PatternRecognitionMode> AbstractInputMethod::patte
}
/*!
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
This method is called when a trace interaction starts with the specified \a patternRecognitionMode.
The \a traceCaptureDeviceInfo provides information about the source device and the
@@ -181,7 +181,7 @@ DeclarativeTrace *AbstractInputMethod::traceBegin(DeclarativeInputEngine::Patter
}
/*!
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
This method is called when the trace interaction ends. The input method should destroy the \a trace object
at some point after this function is called. See the \l Trace API how to access the gathered
diff --git a/src/virtualkeyboard/content/InputPanel.qml b/src/virtualkeyboard/content/InputPanel.qml
index de293171..58d87fc5 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
/*!
\qmltype InputPanel
diff --git a/src/virtualkeyboard/content/components/AlternativeKeys.qml b/src/virtualkeyboard/content/components/AlternativeKeys.qml
index 9375d4d0..6fc783e1 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
Item {
property bool active: listView.currentIndex != -1
diff --git a/src/virtualkeyboard/content/components/AutoScroller.qml b/src/virtualkeyboard/content/components/AutoScroller.qml
index fcb03a4e..95c06496 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
Item {
diff --git a/src/virtualkeyboard/content/components/EnterKey.qml b/src/virtualkeyboard/content/components/EnterKey.qml
index 55a57386..d1fce1c4 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
/*!
\qmltype EnterKey
diff --git a/src/virtualkeyboard/content/components/HandwritingModeKey.qml b/src/virtualkeyboard/content/components/HandwritingModeKey.qml
index 7eb44a93..bd616c75 100644
--- a/src/virtualkeyboard/content/components/HandwritingModeKey.qml
+++ b/src/virtualkeyboard/content/components/HandwritingModeKey.qml
@@ -23,7 +23,7 @@ import QtQuick 2.0
\inqmlmodule QtQuick.Enterprise.VirtualKeyboard
\ingroup qtvirtualkeyboard-qml
\inherits Key
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
\brief Hand writing mode key for keyboard layouts.
diff --git a/src/virtualkeyboard/content/components/HideKeyboardKey.qml b/src/virtualkeyboard/content/components/HideKeyboardKey.qml
index fac42081..ccff550b 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
/*!
\qmltype HideKeyboardKey
diff --git a/src/virtualkeyboard/content/components/Keyboard.qml b/src/virtualkeyboard/content/components/Keyboard.qml
index c5d79556..ba1f763c 100644
--- a/src/virtualkeyboard/content/components/Keyboard.qml
+++ b/src/virtualkeyboard/content/components/Keyboard.qml
@@ -18,8 +18,8 @@
import QtQuick 2.0
import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 1.3
-import QtQuick.Enterprise.VirtualKeyboard.Styles 1.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
import QtQuick.Enterprise.VirtualKeyboard.Settings 1.2
import Qt.labs.folderlistmodel 2.0
@@ -63,7 +63,7 @@ Item {
function initDefaultInputMethod() {
try {
- return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.3; HunspellInputMethod {}', keyboard, "defaultInputMethod")
+ return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HunspellInputMethod {}', keyboard, "defaultInputMethod")
} catch (e) { }
return plainInputMethod
}
@@ -519,7 +519,7 @@ Item {
var soundId = Qt.md5(sound)
multiSoundEffect = __sounds[soundId]
if (!multiSoundEffect) {
- multiSoundEffect = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.3; MultiSoundEffect {}', soundEffect)
+ multiSoundEffect = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; 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 8610b7e5..6a91056a 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
/*!
\qmltype KeyboardLayout
@@ -36,7 +36,7 @@ import QtQuick.Enterprise.VirtualKeyboard 1.3
\code
import QtQuick 2.0
import QtQuick.Layouts 1.0
- import QtQuick.Enterprise.VirtualKeyboard 1.3
+ import QtQuick.Enterprise.VirtualKeyboard 2.0
// file: layouts/en_GB/main.qml
diff --git a/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml b/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml
index f2fff916..3bd88017 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.3
+ import QtQuick.Enterprise.VirtualKeyboard 2.0
// file: layouts/en_GB/symbols.qml
diff --git a/src/virtualkeyboard/content/components/MultitapInputMethod.qml b/src/virtualkeyboard/content/components/MultitapInputMethod.qml
index f78d7dd7..cc6117e1 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
InputMethod {
property string multitapSequence
diff --git a/src/virtualkeyboard/content/components/ShiftKey.qml b/src/virtualkeyboard/content/components/ShiftKey.qml
index a1b953a5..9c9601fc 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
/*!
\qmltype ShiftKey
diff --git a/src/virtualkeyboard/content/components/TraceInputArea.qml b/src/virtualkeyboard/content/components/TraceInputArea.qml
index 7f54173f..3bbf52f2 100644
--- a/src/virtualkeyboard/content/components/TraceInputArea.qml
+++ b/src/virtualkeyboard/content/components/TraceInputArea.qml
@@ -18,14 +18,14 @@
import QtQuick 2.0
import QtQuick.Window 2.2
-import QtQuick.Enterprise.VirtualKeyboard 1.4
+import QtQuick.Enterprise.VirtualKeyboard 2.0
/*!
\qmltype TraceInputArea
\inqmlmodule QtQuick.Enterprise.VirtualKeyboard
\ingroup qtvirtualkeyboard-qml
\inherits MultiPointTouchArea
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
\brief A specialized MultiPointTouchArea for collecting touch input data.
diff --git a/src/virtualkeyboard/content/components/TraceInputKey.qml b/src/virtualkeyboard/content/components/TraceInputKey.qml
index 9b22cd62..836058b9 100644
--- a/src/virtualkeyboard/content/components/TraceInputKey.qml
+++ b/src/virtualkeyboard/content/components/TraceInputKey.qml
@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.0
\inqmlmodule QtQuick.Enterprise.VirtualKeyboard
\ingroup qtvirtualkeyboard-qml
\inherits Item
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
\brief A specialized key for collecting touch input data.
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/digits.qml b/src/virtualkeyboard/content/layouts/ar_AR/digits.qml
index 84bd696d..182519b6 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
KeyboardLayout {
inputMethod: PlainInputMethod {}
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/main.qml b/src/virtualkeyboard/content/layouts/ar_AR/main.qml
index 6272bf60..b5137663 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 fd5723c5..4a3395f3 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
KeyboardLayout {
inputMethod: PlainInputMethod {}
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml b/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml
index c31afb00..53882410 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 04f11d1f..d3c257db 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 6cdd4871..964f7038 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 312fdce7..850556e2 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 6cdd4871..964f7038 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 a504a898..84160670 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
KeyboardLayout {
inputMethod: PlainInputMethod {}
diff --git a/src/virtualkeyboard/content/layouts/en_GB/digits.qml b/src/virtualkeyboard/content/layouts/en_GB/digits.qml
index 9b118b1c..599570c0 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
KeyboardLayout {
inputMethod: PlainInputMethod {}
diff --git a/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml b/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml
index ff275254..56df75ea 100644
--- a/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml
@@ -18,11 +18,11 @@
import QtQuick 2.0
import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 1.4
+import QtQuick.Enterprise.VirtualKeyboard 2.0
KeyboardLayout {
function createInputMethod() {
- return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.4; HandwritingInputMethod {}', parent)
+ return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
}
sharedLayouts: ['symbols']
inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/en_GB/main.qml b/src/virtualkeyboard/content/layouts/en_GB/main.qml
index f600e9d2..0ff4727d 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.4
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 cd7e9277..83e76778 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
KeyboardLayout {
inputMethod: PlainInputMethod {}
diff --git a/src/virtualkeyboard/content/layouts/en_GB/symbols.qml b/src/virtualkeyboard/content/layouts/en_GB/symbols.qml
index 6cdd4871..964f7038 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 9ed48182..e81907eb 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 3e2a658b..45ac8066 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 df60fd2a..d600e880 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
KeyboardLayout {
inputMethod: PlainInputMethod {}
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/main.qml b/src/virtualkeyboard/content/layouts/fa_FA/main.qml
index 20880ca0..dd1067fd 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 b4763120..7ddc56c5 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
KeyboardLayout {
inputMethod: PlainInputMethod {}
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml b/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml
index a91ee169..a56beee0 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 93700a06..6119fd28 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 6cdd4871..964f7038 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 e72e6e60..f9065917 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 6cdd4871..964f7038 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 5868a338..89f1feca 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 d9cede65..b9a4df7f 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 97bc9b24..3ca0c480 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 6cdd4871..964f7038 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 11f8a519..71e39ea9 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
KeyboardLayoutLoader {
function createInputMethod() {
- return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.3; JapaneseInputMethod {}', parent, "japaneseInputMethod")
+ return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; JapaneseInputMethod {}', parent, "japaneseInputMethod")
}
sharedLayouts: ['symbols']
sourceComponent: InputContext.inputEngine.inputMode === InputEngine.FullwidthLatin ? page2 : page1
diff --git a/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml b/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml
index d547a8c3..e19346ed 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
KeyboardLayoutLoader {
function createInputMethod() {
- return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.3; JapaneseInputMethod {}', parent, "japaneseInputMethod")
+ return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; JapaneseInputMethod {}', parent, "japaneseInputMethod")
}
sharedLayouts: ['main']
property int page
diff --git a/src/virtualkeyboard/content/layouts/ko_KR/main.qml b/src/virtualkeyboard/content/layouts/ko_KR/main.qml
index a58e6aa4..65e0199c 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
KeyboardLayoutLoader {
function createInputMethod() {
- return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.3; HangulInputMethod {}', parent, "hangulInputMethod")
+ return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HangulInputMethod {}', parent, "hangulInputMethod")
}
sourceComponent: InputContext.shift ? page2 : page1
sharedLayouts: ['symbols']
diff --git a/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml b/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml
index f9596a1c..b663546f 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
KeyboardLayoutLoader {
function createInputMethod() {
- return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.3; HangulInputMethod {}', parent, "hangulInputMethod")
+ return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HangulInputMethod {}', parent, "hangulInputMethod")
}
sharedLayouts: ['main']
property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/nb_NO/main.qml b/src/virtualkeyboard/content/layouts/nb_NO/main.qml
index 8fbae9b8..2fb36d4a 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 6cdd4871..964f7038 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 a29bf506..bf324335 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 6cdd4871..964f7038 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 1ca0b129..2225f5d1 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 6cdd4871..964f7038 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 cf15fdce..2ee8406b 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 1866e26b..73fdbc7c 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 93700a06..6119fd28 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 6cdd4871..964f7038 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
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 2e65f479..022734fb 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
KeyboardLayout {
function createInputMethod() {
- return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.3; PinyinInputMethod {}', parent, "pinyinInputMethod")
+ return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; PinyinInputMethod {}', parent, "pinyinInputMethod")
}
sharedLayouts: ['symbols']
keyWeight: 160
diff --git a/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml b/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml
index 58e65fd2..eaee5ee1 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
KeyboardLayoutLoader {
function createInputMethod() {
- return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 1.3; PinyinInputMethod {}', parent, "pinyinInputMethod")
+ return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; PinyinInputMethod {}', parent, "pinyinInputMethod")
}
sharedLayouts: ['main']
property int page
diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/virtualkeyboard/content/styles/default/style.qml
index b1f1a623..2eb0cb50 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.4
-import QtQuick.Enterprise.VirtualKeyboard.Styles 1.4
+import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
KeyboardStyle {
id: currentStyle
diff --git a/src/virtualkeyboard/content/styles/retro/style.qml b/src/virtualkeyboard/content/styles/retro/style.qml
index 82a6ebcd..841ec7b1 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.4
-import QtQuick.Enterprise.VirtualKeyboard.Styles 1.4
+import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
KeyboardStyle {
id: currentStyle
diff --git a/src/virtualkeyboard/declarativeinputcontext.cpp b/src/virtualkeyboard/declarativeinputcontext.cpp
index 8e740039..cb13bf23 100644
--- a/src/virtualkeyboard/declarativeinputcontext.cpp
+++ b/src/virtualkeyboard/declarativeinputcontext.cpp
@@ -32,7 +32,7 @@
#endif
/*!
- \qmlmodule QtQuick.Enterprise.VirtualKeyboard 1.3
+ \qmlmodule QtQuick.Enterprise.VirtualKeyboard 2.0
This module provides a collection of QML components for Qt Virtual Keyboard.
*/
diff --git a/src/virtualkeyboard/declarativeinputengine.cpp b/src/virtualkeyboard/declarativeinputengine.cpp
index c9644ce1..242ccd4b 100644
--- a/src/virtualkeyboard/declarativeinputengine.cpp
+++ b/src/virtualkeyboard/declarativeinputengine.cpp
@@ -467,7 +467,7 @@ QList<int> DeclarativeInputEngine::patternRecognitionModes() const
/*!
\qmlmethod Trace InputEngine::traceBegin(int patternRecognitionMode, var traceCaptureDeviceInfo, var traceScreenInfo)
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
Starts a trace interaction with the input engine.
@@ -487,7 +487,7 @@ QList<int> DeclarativeInputEngine::patternRecognitionModes() const
The trace interaction is ended by calling the \l {InputEngine::traceEnd()} {InputEngine.traceEnd()} method.
*/
/*!
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
Starts a trace interaction with the input engine.
@@ -795,14 +795,14 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
/*!
\qmlproperty list<int> InputEngine::patternRecognitionModes
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
The list of available pattern recognition modes.
*/
/*!
\property DeclarativeInputEngine::patternRecognitionModes
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
\brief the list of available pattern recognition modes.
The list of available pattern recognition modes.
@@ -902,7 +902,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
/*!
\qmlsignal void InputEngine::patternRecognitionModesChanged()
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
Indicates that the available pattern recognition modes have changed.
@@ -916,7 +916,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
/*!
\fn void DeclarativeInputEngine::patternRecognitionModesChanged()
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
Indicates that the available pattern recognition modes have changed.
*/
diff --git a/src/virtualkeyboard/declarativeinputmethod.cpp b/src/virtualkeyboard/declarativeinputmethod.cpp
index 060132da..2c34d972 100644
--- a/src/virtualkeyboard/declarativeinputmethod.cpp
+++ b/src/virtualkeyboard/declarativeinputmethod.cpp
@@ -151,7 +151,7 @@
/*!
\qmlmethod list<int> InputMethod::patternRecognitionModes()
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
Returns list of supported pattern recognition modes.
@@ -161,7 +161,7 @@
/*!
\qmlmethod Trace InputMethod::traceBegin(var traceCaptureDeviceInfo, var traceScreenInfo)
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
This method is called when a trace interaction starts. The \a traceCaptureDeviceInfo provides
information about the source device and the \a traceScreenInfo provides information about the screen
@@ -175,7 +175,7 @@
/*!
\qmlmethod bool InputMethod::traceEnd(Trace trace)
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
This method is called when the trace interaction ends. The input method should destroy the \a trace object
at some point after this function is called. See the \l Trace API how to access the gathered
diff --git a/src/virtualkeyboard/declarativetrace.cpp b/src/virtualkeyboard/declarativetrace.cpp
index e390d8d1..0b31c65c 100644
--- a/src/virtualkeyboard/declarativetrace.cpp
+++ b/src/virtualkeyboard/declarativetrace.cpp
@@ -39,7 +39,7 @@ public:
/*!
\class DeclarativeTrace
\inmodule qtvirtualkeyboard
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
\brief Trace is a data model for touch input data.
Trace provides the data model for coordinate data and other
@@ -103,7 +103,7 @@ public:
\instantiates DeclarativeTrace
\inqmlmodule QtQuick.Enterprise.VirtualKeyboard
\ingroup qtvirtualkeyboard-qml
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
\brief Trace is a data model for touch input data.
Trace provides the data model for coordinate data and other
diff --git a/src/virtualkeyboard/doc/src/deployment-guide.qdoc b/src/virtualkeyboard/doc/src/deployment-guide.qdoc
index 206c4078..33735153 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.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
Item {
id: root
diff --git a/src/virtualkeyboard/doc/src/technical-guide.qdoc b/src/virtualkeyboard/doc/src/technical-guide.qdoc
index 35e58245..320abe3e 100644
--- a/src/virtualkeyboard/doc/src/technical-guide.qdoc
+++ b/src/virtualkeyboard/doc/src/technical-guide.qdoc
@@ -266,7 +266,7 @@ InputEngine::wordCandidateListModel property.
\section1 Integrating Handwriting Recognition
-Since the version 1.4 of the virtual keyboard, the input methods can consume
+Since the version 2.0 of the virtual keyboard, the input methods can consume
touch input data from touch screen or other input device.
\section2 Data Model for the Handwriting Input
@@ -379,7 +379,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.3
+ import QtQuick.Enterprise.VirtualKeyboard 2.0
// file: layouts/en_GB/main.qml
@@ -412,7 +412,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.3
+ import QtQuick.Enterprise.VirtualKeyboard 2.0
// file: layouts/en_GB/main.qml
@@ -470,7 +470,7 @@ For example:
\code
import QtQuick 2.0
import QtQuick.Layouts 1.0
- import QtQuick.Enterprise.VirtualKeyboard 1.3
+ import QtQuick.Enterprise.VirtualKeyboard 2.0
// file: layouts/en_GB/symbols.qml
diff --git a/src/virtualkeyboard/plugin.cpp b/src/virtualkeyboard/plugin.cpp
index 85339fe6..ef2c4726 100644
--- a/src/virtualkeyboard/plugin.cpp
+++ b/src/virtualkeyboard/plugin.cpp
@@ -91,30 +91,42 @@ QPlatformInputContext *PlatformInputContextPlugin::create(const QString &system,
return Q_NULLPTR;
qmlRegisterSingletonType<DeclarativeInputContext>(pluginUri, 1, 0, "InputContext", createInputContextModule);
+ qmlRegisterSingletonType<DeclarativeInputContext>(pluginUri, 2, 0, "InputContext", createInputContextModule);
qmlRegisterUncreatableType<DeclarativeInputEngine>(pluginUri, 1, 0, "InputEngine", QLatin1String("Cannot create input method engine"));
+ qmlRegisterUncreatableType<DeclarativeInputEngine>(pluginUri, 2, 0, "InputEngine", QLatin1String("Cannot create input method engine"));
qmlRegisterUncreatableType<DeclarativeShiftHandler>(pluginUri, 1, 0, "ShiftHandler", QLatin1String("Cannot create shift handler"));
+ qmlRegisterUncreatableType<DeclarativeShiftHandler>(pluginUri, 2, 0, "ShiftHandler", QLatin1String("Cannot create shift handler"));
qmlRegisterUncreatableType<DeclarativeSelectionListModel>(pluginUri, 1, 0, "SelectionListModel", QLatin1String("Cannot create selection list model"));
+ qmlRegisterUncreatableType<DeclarativeSelectionListModel>(pluginUri, 2, 0, "SelectionListModel", QLatin1String("Cannot create selection list model"));
qmlRegisterUncreatableType<AbstractInputMethod>(pluginUri, 1, 0, "AbstractInputMethod", QLatin1String("Cannot create abstract input method"));
+ qmlRegisterUncreatableType<AbstractInputMethod>(pluginUri, 2, 0, "AbstractInputMethod", QLatin1String("Cannot create abstract input method"));
qmlRegisterType<PlainInputMethod>(pluginUri, 1, 0, "PlainInputMethod");
+ qmlRegisterType<PlainInputMethod>(pluginUri, 2, 0, "PlainInputMethod");
qmlRegisterType<DeclarativeInputMethod>(pluginUri, 1, 0, "InputMethod");
+ qmlRegisterType<DeclarativeInputMethod>(pluginUri, 2, 0, "InputMethod");
#ifdef HAVE_HUNSPELL
qmlRegisterType<HunspellInputMethod>(pluginUri, 1, 0, "HunspellInputMethod");
+ qmlRegisterType<HunspellInputMethod>(pluginUri, 2, 0, "HunspellInputMethod");
#endif
#ifdef HAVE_PINYIN
qmlRegisterType<PinyinInputMethod>(pluginUri, 1, 1, "PinyinInputMethod");
+ qmlRegisterType<PinyinInputMethod>(pluginUri, 2, 0, "PinyinInputMethod");
#endif
#ifdef HAVE_HANGUL
qmlRegisterType<HangulInputMethod>(pluginUri, 1, 3, "HangulInputMethod");
+ qmlRegisterType<HangulInputMethod>(pluginUri, 2, 0, "HangulInputMethod");
#endif
#ifdef HAVE_OPENWNN
qmlRegisterType<OpenWnnInputMethod>(pluginUri, 1, 3, "JapaneseInputMethod");
+ qmlRegisterType<OpenWnnInputMethod>(pluginUri, 2, 0, "JapaneseInputMethod");
#endif
#ifdef HAVE_LIPI_TOOLKIT
- qmlRegisterType<LipiInputMethod>(pluginUri, 1, 4, "HandwritingInputMethod");
+ qmlRegisterType<LipiInputMethod>(pluginUri, 2, 0, "HandwritingInputMethod");
#endif
qmlRegisterType<EnterKeyActionAttachedType>();
qmlRegisterType<EnterKeyAction>(pluginUri, 1, 0, "EnterKeyAction");
- qmlRegisterType<DeclarativeTrace>(pluginUri, 1, 4, "Trace");
+ qmlRegisterType<EnterKeyAction>(pluginUri, 2, 0, "EnterKeyAction");
+ qmlRegisterType<DeclarativeTrace>(pluginUri, 2, 0, "Trace");
qmlRegisterSingletonType<DeclarativeSettings>(pluginSettingsUri, 1, 0, "VirtualKeyboardSettings", DeclarativeSettings::registerSettingsModule);
qmlRegisterSingletonType<DeclarativeSettings>(pluginSettingsUri, 1, 1, "VirtualKeyboardSettings", DeclarativeSettings::registerSettingsModule);
qmlRegisterSingletonType<DeclarativeSettings>(pluginSettingsUri, 1, 2, "VirtualKeyboardSettings", DeclarativeSettings::registerSettingsModule);
@@ -123,31 +135,52 @@ QPlatformInputContext *PlatformInputContextPlugin::create(const QString &system,
qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), pluginUri, 1, 0, "InputPanel");
qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), pluginUri, 1, 2, "InputPanel");
qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), pluginUri, 1, 3, "InputPanel");
+ qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), pluginUri, 2, 0, "InputPanel");
const QString componentsPath = path + QStringLiteral("components/");
qmlRegisterType(QUrl(componentsPath + QLatin1String("AlternativeKeys.qml")), pluginUri, 1, 0, "AlternativeKeys");
qmlRegisterType(QUrl(componentsPath + QLatin1String("AutoScroller.qml")), pluginUri, 1, 0, "AutoScroller");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("AutoScroller.qml")), pluginUri, 2, 0, "AutoScroller");
qmlRegisterType(QUrl(componentsPath + QLatin1String("BackspaceKey.qml")), pluginUri, 1, 0, "BackspaceKey");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("BackspaceKey.qml")), pluginUri, 2, 0, "BackspaceKey");
qmlRegisterType(QUrl(componentsPath + QLatin1String("BaseKey.qml")), pluginUri, 1, 0, "BaseKey");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("BaseKey.qml")), pluginUri, 2, 0, "BaseKey");
qmlRegisterType(QUrl(componentsPath + QLatin1String("ChangeLanguageKey.qml")), pluginUri, 1, 0, "ChangeLanguageKey");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("ChangeLanguageKey.qml")), pluginUri, 2, 0, "ChangeLanguageKey");
qmlRegisterType(QUrl(componentsPath + QLatin1String("CharacterPreviewBubble.qml")), pluginUri, 1, 0, "CharacterPreviewBubble");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("CharacterPreviewBubble.qml")), pluginUri, 2, 0, "CharacterPreviewBubble");
qmlRegisterType(QUrl(componentsPath + QLatin1String("EnterKey.qml")), pluginUri, 1, 0, "EnterKey");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("EnterKey.qml")), pluginUri, 2, 0, "EnterKey");
qmlRegisterType(QUrl(componentsPath + QLatin1String("FillerKey.qml")), pluginUri, 1, 0, "FillerKey");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("FillerKey.qml")), pluginUri, 2, 0, "FillerKey");
qmlRegisterType(QUrl(componentsPath + QLatin1String("HideKeyboardKey.qml")), pluginUri, 1, 0, "HideKeyboardKey");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("HideKeyboardKey.qml")), pluginUri, 2, 0, "HideKeyboardKey");
qmlRegisterType(QUrl(componentsPath + QLatin1String("KeyboardColumn.qml")), pluginUri, 1, 0, "KeyboardColumn");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("KeyboardColumn.qml")), pluginUri, 2, 0, "KeyboardColumn");
qmlRegisterType(QUrl(componentsPath + QLatin1String("KeyboardLayout.qml")), pluginUri, 1, 0, "KeyboardLayout");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("KeyboardLayout.qml")), pluginUri, 2, 0, "KeyboardLayout");
qmlRegisterType(QUrl(componentsPath + QLatin1String("KeyboardLayoutLoader.qml")), pluginUri, 1, 1, "KeyboardLayoutLoader");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("KeyboardLayoutLoader.qml")), pluginUri, 2, 0, "KeyboardLayoutLoader");
qmlRegisterType(QUrl(componentsPath + QLatin1String("Keyboard.qml")), pluginUri, 1, 0, "Keyboard");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("Keyboard.qml")), pluginUri, 2, 0, "Keyboard");
qmlRegisterType(QUrl(componentsPath + QLatin1String("KeyboardRow.qml")), pluginUri, 1, 0, "KeyboardRow");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("KeyboardRow.qml")), pluginUri, 2, 0, "KeyboardRow");
qmlRegisterType(QUrl(componentsPath + QLatin1String("Key.qml")), pluginUri, 1, 0, "Key");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("Key.qml")), pluginUri, 2, 0, "Key");
qmlRegisterType(QUrl(componentsPath + QLatin1String("MultiSoundEffect.qml")), pluginUri, 1, 1, "MultiSoundEffect");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("MultiSoundEffect.qml")), pluginUri, 2, 0, "MultiSoundEffect");
qmlRegisterType(QUrl(componentsPath + QLatin1String("MultitapInputMethod.qml")), pluginUri, 1, 0, "MultitapInputMethod");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("MultitapInputMethod.qml")), pluginUri, 2, 0, "MultitapInputMethod");
qmlRegisterType(QUrl(componentsPath + QLatin1String("NumberKey.qml")), pluginUri, 1, 0, "NumberKey");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("NumberKey.qml")), pluginUri, 2, 0, "NumberKey");
qmlRegisterType(QUrl(componentsPath + QLatin1String("ShiftKey.qml")), pluginUri, 1, 0, "ShiftKey");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("ShiftKey.qml")), pluginUri, 2, 0, "ShiftKey");
qmlRegisterType(QUrl(componentsPath + QLatin1String("SpaceKey.qml")), pluginUri, 1, 0, "SpaceKey");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("SpaceKey.qml")), pluginUri, 2, 0, "SpaceKey");
qmlRegisterType(QUrl(componentsPath + QLatin1String("SymbolModeKey.qml")), pluginUri, 1, 0, "SymbolModeKey");
- qmlRegisterType(QUrl(componentsPath + QLatin1String("HandwritingModeKey.qml")), pluginUri, 1, 4, "HandwritingModeKey");
- qmlRegisterType(QUrl(componentsPath + QLatin1String("TraceInputArea.qml")), pluginUri, 1, 4, "TraceInputArea");
- qmlRegisterType(QUrl(componentsPath + QLatin1String("TraceInputKey.qml")), pluginUri, 1, 4, "TraceInputKey");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("SymbolModeKey.qml")), pluginUri, 2, 0, "SymbolModeKey");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("HandwritingModeKey.qml")), pluginUri, 2, 0, "HandwritingModeKey");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("TraceInputArea.qml")), pluginUri, 2, 0, "TraceInputArea");
+ qmlRegisterType(QUrl(componentsPath + QLatin1String("TraceInputKey.qml")), pluginUri, 2, 0, "TraceInputKey");
if (system.compare(system, QLatin1String(pluginName), Qt::CaseInsensitive) == 0) {
platformInputContext = new PlatformInputContext();
diff --git a/src/virtualkeyboard/styles/KeyboardStyle.qml b/src/virtualkeyboard/styles/KeyboardStyle.qml
index 96636a28..081c8d96 100644
--- a/src/virtualkeyboard/styles/KeyboardStyle.qml
+++ b/src/virtualkeyboard/styles/KeyboardStyle.qml
@@ -266,7 +266,7 @@ QtObject {
property Component navigationHighlight: null
/*!
- \since QtQuick.Enterprise.VirtualKeyboard.Styles 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
Template for the trace input key.
@@ -275,7 +275,7 @@ QtObject {
property Component traceInputKeyPanelDelegate: null
/*!
- \since QtQuick.Enterprise.VirtualKeyboard.Styles 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
Template for rendering a Trace object.
diff --git a/src/virtualkeyboard/styles/TraceCanvas.qml b/src/virtualkeyboard/styles/TraceCanvas.qml
index 1103495e..74347b13 100644
--- a/src/virtualkeyboard/styles/TraceCanvas.qml
+++ b/src/virtualkeyboard/styles/TraceCanvas.qml
@@ -25,7 +25,7 @@ import "TraceUtils.js" as TraceUtils
\brief A specialized Canvas type for rendering Trace objects.
\ingroup qtvirtualkeyboard-styles-qml
\inherits Canvas
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
This type provides capabilities for rendering Trace objects on the screen.
diff --git a/src/virtualkeyboard/styles/TraceInputKeyPanel.qml b/src/virtualkeyboard/styles/TraceInputKeyPanel.qml
index 269c319c..6c49de01 100644
--- a/src/virtualkeyboard/styles/TraceInputKeyPanel.qml
+++ b/src/virtualkeyboard/styles/TraceInputKeyPanel.qml
@@ -23,7 +23,7 @@ import QtQuick 2.0
\inqmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles
\brief A base type of the trace input key.
\ingroup qtvirtualkeyboard-styles-qml
- \since QtQuick.Enterprise.VirtualKeyboard 1.4
+ \since QtQuick.Enterprise.VirtualKeyboard 2.0
This type provides panel for decorating TraceInputKey
items in the keyboard layout.
diff --git a/src/virtualkeyboard/styles/styles_plugin.cpp b/src/virtualkeyboard/styles/styles_plugin.cpp
index 7d5f25e4..46a69b86 100644
--- a/src/virtualkeyboard/styles/styles_plugin.cpp
+++ b/src/virtualkeyboard/styles/styles_plugin.cpp
@@ -23,7 +23,7 @@
#include <QtCore/QLibraryInfo>
/*!
- \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles 1.3
+ \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
This module provides styling components for the Qt Virtual Keyboard.
*/
@@ -36,11 +36,15 @@ void StylesPlugin::registerTypes(const char *uri)
qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 1, 1, "KeyboardStyle");
qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 1, 2, "KeyboardStyle");
qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 1, 3, "KeyboardStyle");
+ qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 2, 0, "KeyboardStyle");
qmlRegisterType(QUrl(path + QLatin1String("KeyIcon.qml")), uri, 1, 0, "KeyIcon");
+ qmlRegisterType(QUrl(path + QLatin1String("KeyIcon.qml")), uri, 2, 0, "KeyIcon");
qmlRegisterType(QUrl(path + QLatin1String("KeyPanel.qml")), uri, 1, 0, "KeyPanel");
+ qmlRegisterType(QUrl(path + QLatin1String("KeyPanel.qml")), uri, 2, 0, "KeyPanel");
qmlRegisterType(QUrl(path + QLatin1String("SelectionListItem.qml")), uri, 1, 0, "SelectionListItem");
- qmlRegisterType(QUrl(path + QLatin1String("TraceInputKeyPanel.qml")), uri, 1, 4, "TraceInputKeyPanel");
- qmlRegisterType(QUrl(path + QLatin1String("TraceCanvas.qml")), uri, 1, 4, "TraceCanvas");
+ qmlRegisterType(QUrl(path + QLatin1String("SelectionListItem.qml")), uri, 2, 0, "SelectionListItem");
+ qmlRegisterType(QUrl(path + QLatin1String("TraceInputKeyPanel.qml")), uri, 2, 0, "TraceInputKeyPanel");
+ qmlRegisterType(QUrl(path + QLatin1String("TraceCanvas.qml")), uri, 2, 0, "TraceCanvas");
}
void StylesPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
diff --git a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml
index 4c4568b0..0b0c9769 100644
--- a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml
+++ b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml
@@ -18,7 +18,7 @@
import QtTest 1.0
import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 1.3
+import QtQuick.Enterprise.VirtualKeyboard 2.0
import QtQuick.Enterprise.VirtualKeyboard.Settings 1.2
import "unipen_data.js" as UnipenData
diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml
index 0a72e690..fd4a65cd 100644
--- a/tests/auto/inputpanel/data/tst_inputpanel.qml
+++ b/tests/auto/inputpanel/data/tst_inputpanel.qml
@@ -100,6 +100,9 @@ Rectangle {
{ qml: "import QtQuick 2.0; \
import QtQuick.Enterprise.VirtualKeyboard 1.3; \
InputPanel {}" },
+ { qml: "import QtQuick 2.0; \
+ import QtQuick.Enterprise.VirtualKeyboard 2.0; \
+ InputPanel {}" },
{ qml: "import QtQuick 2.0; \
import QtQuick.Enterprise.VirtualKeyboard.Styles 1.0; \
KeyboardStyle {}" },
@@ -112,6 +115,9 @@ Rectangle {
{ qml: "import QtQuick 2.0; \
import QtQuick.Enterprise.VirtualKeyboard.Styles 1.3; \
KeyboardStyle {}" },
+ { qml: "import QtQuick 2.0; \
+ import QtQuick.Enterprise.VirtualKeyboard.Styles 2.0; \
+ KeyboardStyle {}" },
{ qml: "import QtQuick 2.0; \
import QtQuick.Enterprise.VirtualKeyboard.Settings 1.0; \
Item { property var styleName: VirtualKeyboardSettings.styleName }" },
--
GitLab