diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-11-10 09:10:53 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-12-20 08:20:57 +0000 |
| commit | 507e54ddacab0897fff93a1cd86e134af391f8b9 (patch) | |
| tree | 43a77082eeb32b2fac383052eb2e9fa3c47dade5 | |
| parent | 70f36ebae41a7f4445d8bc94ded78ba4a04613de (diff) | |
| download | meta-qt5-507e54ddacab0897fff93a1cd86e134af391f8b9.tar.gz | |
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 <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 3 |
1 files changed, 1 insertions, 2 deletions
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 ??= "" | |||
| 17 | # older geoclue 0.12.99 is needed | 17 | # older geoclue 0.12.99 is needed |
| 18 | PACKAGECONFIG[geoclue] = ",,geoclue" | 18 | PACKAGECONFIG[geoclue] = ",,geoclue" |
| 19 | PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" | 19 | PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" |
| 20 | PACKAGECONFIG[mapboxgl] = "" | 20 | PACKAGECONFIG[geoservices_mapboxgl] = "-feature-geoservices_mapboxgl,-no-feature-geoservices_mapboxgl" |
| 21 | 21 | ||
| 22 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'mapboxgl', 'CONFIG+=mapboxgl', '', d)}" | ||
| 23 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 22 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
| 24 | 23 | ||
| 25 | # The same issue as in qtbase: | 24 | # The same issue as in qtbase: |