diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-11-10 09:10:53 +0200 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2018-01-16 10:58:20 -0200 |
| commit | 85fd8c2127e0958097bf1517ca97af657d4e5bc1 (patch) | |
| tree | eccb6481d32cf26741bea21d911909df2dafec2b | |
| parent | d088f8a4db0e1904d1d8cc7a0c741561a0d6effe (diff) | |
| download | meta-qt5-85fd8c2127e0958097bf1517ca97af657d4e5bc1.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>
(cherry picked from commit 507e54ddacab0897fff93a1cd86e134af391f8b9)
| -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 8d4eb22a..3d947675 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: |