From febc41083ffb1c4e35848dbfbfa6c2da04f3d469 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Fri, 20 Nov 2015 16:22:03 +0200
Subject: Update Qt Virtual Keyboard to 2.0

Enable all special keyboard layouts.

Change-Id: I9309ce058dabe4ba9da5c5d0c1c62c60d02cfda8
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
---
 recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb | 41 ------------------------
 recipes-qt/qt5-addons/qtvirtualkeyboard_2.0.bb | 44 ++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 41 deletions(-)
 delete mode 100644 recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
 create mode 100644 recipes-qt/qt5-addons/qtvirtualkeyboard_2.0.bb

diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
deleted file mode 100644
index ec29c65..0000000
--- a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://www.qt.io/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-DESCRIPTION = "Qt Virtual Keyboard"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=e0b36905c697f1be9c35712f4aced6e0;beginline=1;endline=17"
-
-inherit qt5-module qtquickcompiler sdk-sources
-
-SRC_URI = " \
-    git://codereview.qt-project.org/qt/tqtc-qtvirtualkeyboard;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtVirtualKeyboard/1.3/Src \
-    "
-
-# v1.3.1
-SRCREV = "c2c362d9f313441351e5e7167e22b4fd1b7012a8"
-BRANCH = "1.3"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "qtbase qtdeclarative hunspell"
-
-EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-desktop"
diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_2.0.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_2.0.bb
new file mode 100644
index 0000000..019d29a
--- /dev/null
+++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_2.0.bb
@@ -0,0 +1,44 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+DESCRIPTION = "Qt Virtual Keyboard"
+LICENSE = "QtEnterprise"
+LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e83db02b9629bbd;beginline=1;endline=17"
+
+inherit qt5-module qtquickcompiler sdk-sources
+
+SRC_URI = " \
+    git://codereview.qt-project.org/qt/tqtc-qtvirtualkeyboard;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtVirtualKeyboard/2.0/Src \
+    "
+
+SRCREV = "296f52c04968a06200f256dfaf58c563bf193f10"
+BRANCH = "master"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "qtbase qtdeclarative qtsvg hunspell"
+
+EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-desktop CONFIG+=pinyin CONFIG+=hangul CONFIG+=openwnn CONFIG+=tcime"
+
+PACKAGES += "${PN}-dictionaries"
+RRECOMMENDS_${PN} += "${PN}-dictionaries"
+FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat"
-- 
cgit v1.2.3-54-g00ecf