From 7dace93a31689e3698b4eb86a824690966842fe0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 18 Jan 2016 13:10:30 +0200 Subject: VKB: use PACKAGECONFIG to modify build configuration Change-Id: Id806ae679ae83936f6de75a294d717392f89f2eb Reviewed-by: Teemu Holappa --- recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb index 6187a68..13f02b6 100644 --- a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb @@ -31,7 +31,12 @@ SRCREV = "91273471991b8f1097780f8171f19e7efc622be5" DEPENDS = "qtbase qtdeclarative qtsvg hunspell" -EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-desktop CONFIG+=lang-all CONFIG+=lipi-toolkit" +PACKAGECONFIG ?= "lipi-toolkit lang-all" +PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit" +PACKAGECONFIG[lang-all] = "CONFIG+=lang-all" + +EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}" +EXTRA_QMAKEVARS_PRE += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'CONFIG+=disable-desktop', d)}" PACKAGES += "${PN}-dictionaries" RRECOMMENDS_${PN} += "${PN}-dictionaries" -- cgit v1.2.3-54-g00ecf