From 82dbbfe81e6f85b7265f0b76b9682edf0acfbaea Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 14 Jun 2014 02:01:57 +0200 Subject: qttools: make qtwebkit a PACKAGECONFIG and disable by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- recipes-qt/qt5/qttools.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qttools.inc') diff --git a/recipes-qt/qt5/qttools.inc b/recipes-qt/qt5/qttools.inc index d4d8017f..cd8a97f2 100644 --- a/recipes-qt/qt5/qttools.inc +++ b/recipes-qt/qt5/qttools.inc @@ -1,9 +1,10 @@ require qt5.inc -DEPENDS += "qtbase qtdeclarative qtwebkit qtxmlpatterns" +DEPENDS += "qtbase qtdeclarative qtxmlpatterns" SRC_URI += " \ file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \ + file://0003-add-noqtwebkit-configuration.patch \ " # older copyright year than what e.g. qtbase is using now @@ -13,3 +14,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" FILES_${PN}-examples = "${datadir}/${QT_DIR_NAME}/examples" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[qtwebkit] = ",,qtwebkit" + +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -- cgit v1.2.3-54-g00ecf