summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtlocation_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtlocation_git.bb')
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb9
1 files changed, 2 insertions, 7 deletions
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 268bea1d..cce66017 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -13,17 +13,12 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" 14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
15 15
16SRC_URI += " \
17 file://0001-Make-mapbox-gl-build-configurable.patch \
18"
19
20PACKAGECONFIG ??= "" 16PACKAGECONFIG ??= ""
21# older geoclue 0.12.99 is needed 17# older geoclue 0.12.99 is needed
22PACKAGECONFIG[geoclue] = ",,geoclue" 18PACKAGECONFIG[geoclue] = ",,geoclue"
23PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" 19PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy"
24PACKAGECONFIG[mapboxgl] = "" 20PACKAGECONFIG[geoservices_mapboxgl] = "-feature-geoservices_mapboxgl,-no-feature-geoservices_mapboxgl"
25 21
26EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'mapboxgl', 'CONFIG+=mapboxgl', '', d)}"
27EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 22EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
28 23
29# The same issue as in qtbase: 24# The same issue as in qtbase:
@@ -34,7 +29,7 @@ SRC_URI += " \
34 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 29 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
35" 30"
36 31
37SRCREV_qtlocation = "d22e6d09f1607e694694d2ae5b2f447605a8782e" 32SRCREV_qtlocation = "d919f47308b209c798e50d8ca1b9abd48ba94718"
38SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead" 33SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead"
39 34
40SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 35SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"