aboutsummaryrefslogtreecommitdiffstats
path: root/src/virtualkeyboard/styles
diff options
context:
space:
mode:
authorJarkko Koivikko <jarkko.koivikko@code-q.fi>2014-06-23 15:39:18 +0300
committerMitch Curtis <mitch.curtis@digia.com>2014-06-25 14:18:10 +0300
commit4a39ee5ab4e5fde3955af7c29995eb840a2f1ee1 (patch)
treee441d2fff32eb254feae2b8da6930408485de711 /src/virtualkeyboard/styles
parentdedceb4659d5873c3131d80de8b291de58ab07cd (diff)
Increment API version to 1.1
Make proper adjustments to documentation and qmldir files to remain backwards compatible with the applications still using the 1.0 version. Change-Id: I0a59065b09d4a0e60798629e98a0867c66b8dac8 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/virtualkeyboard/styles')
-rw-r--r--src/virtualkeyboard/styles/KeyPanel.qml4
-rw-r--r--src/virtualkeyboard/styles/KeyboardStyle.qml5
-rw-r--r--src/virtualkeyboard/styles/SelectionListItem.qml4
-rw-r--r--src/virtualkeyboard/styles/qmldir3
-rw-r--r--src/virtualkeyboard/styles/styles_plugin.cpp2
5 files changed, 14 insertions, 4 deletions
diff --git a/src/virtualkeyboard/styles/KeyPanel.qml b/src/virtualkeyboard/styles/KeyPanel.qml
index 6919e72c..3b7804ce 100644
--- a/src/virtualkeyboard/styles/KeyPanel.qml
+++ b/src/virtualkeyboard/styles/KeyPanel.qml
@@ -44,8 +44,10 @@ Item {
*/
property Item control
- /*! Sets the sound effect to be played on key press.
+ /*!
+ \since QtQuick.Enterprise.VirtualKeyboard.Styles 1.1
+ Sets the sound effect to be played on key press.
*/
property url soundEffect
diff --git a/src/virtualkeyboard/styles/KeyboardStyle.qml b/src/virtualkeyboard/styles/KeyboardStyle.qml
index 01721d37..63b9943b 100644
--- a/src/virtualkeyboard/styles/KeyboardStyle.qml
+++ b/src/virtualkeyboard/styles/KeyboardStyle.qml
@@ -232,7 +232,10 @@ QtObject {
/*! Template for the selection list background. */
property Component selectionListBackground: null
- /*! Template for navigation highlight item.
+ /*!
+ \since QtQuick.Enterprise.VirtualKeyboard.Styles 1.1
+
+ Template for navigation highlight item.
This item is used in arrow-key-navigation mode to
highlight the navigation focus on the keyboard.
diff --git a/src/virtualkeyboard/styles/SelectionListItem.qml b/src/virtualkeyboard/styles/SelectionListItem.qml
index e572f471..d5a02047 100644
--- a/src/virtualkeyboard/styles/SelectionListItem.qml
+++ b/src/virtualkeyboard/styles/SelectionListItem.qml
@@ -32,8 +32,10 @@ Item {
id: selectionListItem
height: parent.height
- /*! A sound effect to play on touch event.
+ /*!
+ \since QtQuick.Enterprise.VirtualKeyboard.Styles 1.1
+ Sets the sound effect to be played on touch event.
*/
property url soundEffect
diff --git a/src/virtualkeyboard/styles/qmldir b/src/virtualkeyboard/styles/qmldir
index 322ae1f4..26b64ba5 100644
--- a/src/virtualkeyboard/styles/qmldir
+++ b/src/virtualkeyboard/styles/qmldir
@@ -1,6 +1,9 @@
module QtQuick.Enterprise.VirtualKeyboard.Styles
plugin qtvirtualkeyboardstylesplugin
KeyboardStyle 1.0 KeyboardStyle.qml
+KeyboardStyle 1.1 KeyboardStyle.qml
KeyPanel 1.0 KeyPanel.qml
+KeyPanel 1.1 KeyPanel.qml
KeyIcon 1.0 KeyIcon.qml
SelectionListItem 1.0 SelectionListItem.qml
+SelectionListItem 1.1 SelectionListItem.qml
diff --git a/src/virtualkeyboard/styles/styles_plugin.cpp b/src/virtualkeyboard/styles/styles_plugin.cpp
index 4817ea05..1c369d33 100644
--- a/src/virtualkeyboard/styles/styles_plugin.cpp
+++ b/src/virtualkeyboard/styles/styles_plugin.cpp
@@ -21,7 +21,7 @@
#include <qqml.h>
/*!
- \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles 1.0
+ \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles 1.1
This module provides styling components for the Qt Virtual Keyboard.
*/