diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-06-25 15:03:43 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-06-25 15:04:36 +0300 |
| commit | 364eb068de13c57b6f8ffdac90a88ec14ca71912 (patch) | |
| tree | 9acb2be49af4d84ea5c944294f821a9b8551cb61 /recipes-qt/qt5/qtlocation_git.bb | |
| parent | be7aa4b95623ca068a4c7f84edf6c74e03c8854f (diff) | |
| parent | 2a5f9415e48a38f6f4eb0cf375737a2d8438e2fe (diff) | |
Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
* qtyocto/upstream/warrior:
2a5f941 qtbase: fix build with gcc-9
8bc72a7 qtlocation: add PACKAGECONFIGs for geoservices
46c87e0 qmake5_base.bbclass: Don't expand find -name search patterns
Change-Id: I99658e8311a90d752f92ac486040b24bc98cefb2
Diffstat (limited to 'recipes-qt/qt5/qtlocation_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 96fb663d..6ca3c354 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -17,6 +17,11 @@ PACKAGECONFIG ??= "" # older geoclue 0.12.99 is needed PACKAGECONFIG[geoclue] = ",,geoclue" PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" +PACKAGECONFIG[geoservices_here] = "-feature-geoservices_here,-no-feature-geoservices_here" +PACKAGECONFIG[geoservices_mapbox] = "-feature-geoservices_mapbox,-no-feature-geoservices_mapbox" +PACKAGECONFIG[geoservices_esri] = "-feature-geoservices_esri,-no-feature-geoservices_esri" +PACKAGECONFIG[geoservices_itemsoverlay] = "-feature-geoservices_itemsoverlay,-no-feature-geoservices_itemsoverlay" +PACKAGECONFIG[geoservices_osm] = "-feature-geoservices_osm,-no-feature-geoservices_osm" PACKAGECONFIG[geoservices_mapboxgl] = "-feature-geoservices_mapboxgl,-no-feature-geoservices_mapboxgl" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |