Commit 3856f018 authored by Paolo Angelelli's avatar Paolo Angelelli
Browse files

Add a configure feature for each geoservice plugin


This patch makes it possible to disable geoservice plugins at
configuration time using the QtLite -no-feature-geoservices_xxx syntax.

Change-Id: I276382833db8cfca27383705cbb3f994ced47cb3
Reviewed-by: default avatarAlex Blasche <alexander.blasche@qt.io>
Showing with 80 additions and 7 deletions
{
"subconfigs": [
"src/positioning"
"src/positioning",
"src/location"
]
}
{
"module": "location",
"depends": [
"gui"
],
"features": {
"geoservices_osm": {
"label": "OpenStreetMap",
"purpose": "Provides access to OpenStreetMap geoservices",
"section": "Location",
"condition": "features.concurrent",
"output": [ "privateFeature" ]
},
"geoservices_here": {
"label": "HERE",
"purpose": "Provides access to HERE geoservices",
"section": "Location",
"output": [ "privateFeature" ]
},
"geoservices_esri": {
"label": "Esri",
"purpose": "Provides access to Esri geoservices",
"section": "Location",
"output": [ "privateFeature" ]
},
"geoservices_mapbox": {
"label": "Mapbox",
"purpose": "Provides access to Mapbox geoservices",
"section": "Location",
"output": [ "privateFeature" ]
},
"geoservices_mapboxgl": {
"label": "MapboxGL",
"purpose": "Provides access to the Mapbox vector maps",
"section": "Location",
"condition": [
"features.opengl",
"features.c++14",
"!config.qnx && (!config.win32 || config.mingw)"
],
"output": [ "privateFeature" ]
},
"geoservices_itemsoverlay": {
"label": "Itemsoverlay",
"purpose": "Provides access to the itemsoverlay maps",
"section": "Location",
"output": [ "privateFeature" ]
}
},
"summary": [
{
"section": "Qt Location",
"entries": [
{
"section": "Geoservice plugins",
"entries": [
"geoservices_osm",
"geoservices_here",
"geoservices_esri",
"geoservices_mapbox",
"geoservices_mapboxgl",
"geoservices_itemsoverlay"
]
}
]
}
]
}
TEMPLATE = subdirs
SUBDIRS = nokia mapbox esri itemsoverlay
QT_FOR_CONFIG += location-private # pulls in the features defined in configure.json
qtConfig(concurrent) {
SUBDIRS += osm
}
qtConfig(geoservices_here): SUBDIRS += nokia
qtConfig(geoservices_mapbox): SUBDIRS += mapbox
qtConfig(geoservices_esri): SUBDIRS += esri
qtConfig(geoservices_itemsoverlay): SUBDIRS += itemsoverlay
qtConfig(geoservices_osm): SUBDIRS += osm
qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
qtConfig(geoservices_mapboxgl) {
!exists(../../3rdparty/mapbox-gl-native/mapbox-gl-native.pro) {
warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
} else {
......
......@@ -38,7 +38,7 @@
"summary": [
{
"section": "Qt Location",
"section": "Qt Positioning",
"entries": [
"gypsy",
"winrt_geolocation"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment