[oe] [meta-qt5][PATCH] qtlocation: correct PACKAGECONFIG for mapboxgl

Samuli Piippo samuli.piippo at qt.io
Fri Nov 10 07:10:53 UTC 2017


Previous patch was removed, but PACKAGECONFIG was not changed
to match the new feature flag.

Signed-off-by: Samuli Piippo <samuli.piippo at qt.io>
---
 recipes-qt/qt5/qtlocation_git.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index baa25d8..cce6601 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:
-- 
2.7.4




More information about the Openembedded-devel mailing list