From 507e54ddacab0897fff93a1cd86e134af391f8b9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 10 Nov 2017 09:10:53 +0200 Subject: qtlocation: correct PACKAGECONFIG for mapboxgl Previous patch was removed, but PACKAGECONFIG was not changed to match the new feature flag. Signed-off-by: Samuli Piippo Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtlocation_git.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 69277068..fce37b8b 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -17,9 +17,8 @@ PACKAGECONFIG ??= "" # older geoclue 0.12.99 is needed PACKAGECONFIG[geoclue] = ",,geoclue" PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" -PACKAGECONFIG[mapboxgl] = "" +PACKAGECONFIG[geoservices_mapboxgl] = "-feature-geoservices_mapboxgl,-no-feature-geoservices_mapboxgl" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'mapboxgl', 'CONFIG+=mapboxgl', '', d)}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" # The same issue as in qtbase: -- cgit v1.2.3-54-g00ecf