aboutsummaryrefslogtreecommitdiffstats
path: root/src/virtualkeyboard/styles
diff options
context:
space:
mode:
authorJarkko Koivikko <jarkko.koivikko@code-q.fi>2014-09-03 14:19:50 +0300
committerMitch Curtis <mitch.curtis@digia.com>2014-09-04 13:33:47 +0300
commitbeca47adfad7a2d3413af61b1b0d9a1230b213bb (patch)
tree379ae94eb3f486011123d29d2fe0cf943d11c0f2 /src/virtualkeyboard/styles
parentee4dcc89b81a3a51ef2a5aa934084ddbe004dc44 (diff)
Update version number to 1.2v1.2.0
Change-Id: I630901e9e7d8300043f896cfdf159160867ee349 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Diffstat (limited to 'src/virtualkeyboard/styles')
-rw-r--r--src/virtualkeyboard/styles/qmldir1
-rw-r--r--src/virtualkeyboard/styles/styles_plugin.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/virtualkeyboard/styles/qmldir b/src/virtualkeyboard/styles/qmldir
index 26b64ba5..24246c4a 100644
--- a/src/virtualkeyboard/styles/qmldir
+++ b/src/virtualkeyboard/styles/qmldir
@@ -2,6 +2,7 @@ module QtQuick.Enterprise.VirtualKeyboard.Styles
plugin qtvirtualkeyboardstylesplugin
KeyboardStyle 1.0 KeyboardStyle.qml
KeyboardStyle 1.1 KeyboardStyle.qml
+KeyboardStyle 1.2 KeyboardStyle.qml
KeyPanel 1.0 KeyPanel.qml
KeyPanel 1.1 KeyPanel.qml
KeyIcon 1.0 KeyIcon.qml
diff --git a/src/virtualkeyboard/styles/styles_plugin.cpp b/src/virtualkeyboard/styles/styles_plugin.cpp
index 0a1f6165..a06e8995 100644
--- a/src/virtualkeyboard/styles/styles_plugin.cpp
+++ b/src/virtualkeyboard/styles/styles_plugin.cpp
@@ -21,7 +21,7 @@
#include <qqml.h>
/*!
- \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles 1.1
+ \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles 1.2
This module provides styling components for the Qt Virtual Keyboard.
*/
@@ -34,6 +34,7 @@ void StylesPlugin::registerTypes(const char *uri)
const QString path(STYLES_IMPORT_PATH);
qmlRegisterType(QUrl(path + "KeyboardStyle.qml"), uri, 1, 0, "KeyboardStyle");
qmlRegisterType(QUrl(path + "KeyboardStyle.qml"), uri, 1, 1, "KeyboardStyle");
+ qmlRegisterType(QUrl(path + "KeyboardStyle.qml"), uri, 1, 2, "KeyboardStyle");
qmlRegisterType(QUrl(path + "KeyIcon.qml"), uri, 1, 0, "KeyIcon");
qmlRegisterType(QUrl(path + "KeyPanel.qml"), uri, 1, 0, "KeyPanel");
qmlRegisterType(QUrl(path + "SelectionListItem.qml"), uri, 1, 0, "SelectionListItem");