From fd7ac089917f8f15240bcb650ecd53301383ff7d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 18 Nov 2019 15:40:16 +0200 Subject: qt5: use PACKAGECONFIG to disable tests and examples Currently if qtbase has tests or examples enabled, they will be enabled for every Qt module as well. Change the PACKAGECONFIG options so that they need to be explicitly enabled for each Qt module. Signed-off-by: Samuli Piippo --- recipes-qt/qt5/qt5.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index e0cd8949..6f9a83c4 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -8,8 +8,8 @@ PACKAGECONFIG_OPENSSL ?= "openssl" PACKAGECONFIG[examples] = "" PACKAGECONFIG[tests] = "" PACKAGECONFIG[qtquickcompiler] = ",,qtdeclarative-native" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', '', d)}" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tests', 'QT_BUILD_PARTS+=tests', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', 'QT_BUILD_PARTS-=examples', d)}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tests', 'QT_BUILD_PARTS+=tests', 'QT_BUILD_PARTS-=tests', d)}" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtquickcompiler', 'CONFIG+=qtquickcompiler', '', d)}" # we don't want conflicts with qt4 -- cgit v1.2.3