summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2017-08-15 13:21:48 +0200
committerPaolo Angelelli <paolo.angelelli@qt.io>2017-08-30 12:59:24 +0000
commit3856f0185442b5c4b85c770888072db0bc3fff1a (patch)
treec8427301092a696e2a888f5f236791177f5625c3 /src/plugins
parentf1466b2cd387e2892b79db110979a893f0a0954b (diff)
downloadqtlocation-3856f0185442b5c4b85c770888072db0bc3fff1a.tar.gz
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: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/geoservices/geoservices.pro12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro
index 07c34798..b81ad34a 100644
--- a/src/plugins/geoservices/geoservices.pro
+++ b/src/plugins/geoservices/geoservices.pro
@@ -1,12 +1,14 @@
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 {