diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-09-25 10:29:24 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-09-29 06:38:12 +0000 |
| commit | 48da0529c59c245c53f982ebcc674750669b5979 (patch) | |
| tree | 026934e35d43df98399afe8d0083433d3b260f26 /recipes-qt/qt5/qtlocation_git.bb | |
| parent | 6269d8a5bc402e6dafd8ee8499481d29792d1c4a (diff) | |
qt5: update submodules
Update submodules to first 5.9.2 branch snapshot
Change-Id: If1a6cff5a23bfa1e72b65b5d1f679a3ff64f7c6c
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtlocation_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 9 |
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 = " \ DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" -SRC_URI += " \ - file://0001-Make-mapbox-gl-build-configurable.patch \ -" - 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: @@ -34,7 +29,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "d22e6d09f1607e694694d2ae5b2f447605a8782e" +SRCREV_qtlocation = "d919f47308b209c798e50d8ca1b9abd48ba94718" SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |