VKB: build virtualkeyboard with HWR support enabled

Build with lipi-toolkit. The default installation path for lipi-toolkit
libs causes QA warnings.

Change-Id: I4b7a5986cbd1589fca2bc8744bdb88792bf0b4bd
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>

2 files changed, 8 insertions, 1 deletions

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 4baaa3c..ff20658 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -69,4 +69,6 @@ IMAGE_CLASSES += "image_types_sdcard deploy-conf"
 LICENSE_CREATE_PACKAGE = "1"
 COPY_LIC_MANIFEST = "1"
 
+QT_DIR_NAME = ""
+
 include conf/distro/include/${MACHINE}.conf
diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_2.0.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_2.0.bb
index 6a5050f..f580238 100644
--- a/recipes-qt/qt5-addons/qtvirtualkeyboard_2.0.bb
+++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_2.0.bb
@@ -37,8 +37,13 @@ S = "${WORKDIR}/git"
 
 DEPENDS = "qtbase qtdeclarative qtsvg hunspell"
 
-EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-desktop CONFIG+=lang-all"
+EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-desktop CONFIG+=lang-all CONFIG+=lipi-toolkit"
 
 PACKAGES += "${PN}-dictionaries"
 RRECOMMENDS_${PN} += "${PN}-dictionaries"
 FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat"
+
+FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
+FILES_${PN}-dbg += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit/lib/.debug"
+INSANE_SKIP_${PN} += "libdir"
+INSANE_SKIP_${PN}-dbg += "libdir"