diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-10-12 17:27:15 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-10-25 17:17:30 +0200 |
| commit | 1fa828b7aba04fa0c2449b490894ddb409a4e2d9 (patch) | |
| tree | 4f72f0de4e5833e0f66a74580e21d7336b97eed8 /src | |
| parent | ddc494d287e3f5b82b363ef1b962aa00ffa7c13c (diff) | |
| download | qtlocation-1fa828b7aba04fa0c2449b490894ddb409a4e2d9.tar.gz | |
Disable Esri/Nokia/MapBox plugins
As a first step, put them behind feature flags that are always false.
Remove mapbox-gl-native as a submodule - there's no reason why people
wanting to build that can't clone and build that repo themselves.
Don't test the respective providers unless they are available, and
use the osm plugin when testing the basic plugin framework.
Change-Id: I53429878e53294dce52ee830a4b4613f372898c6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src')
| m--------- | src/3rdparty/mapbox-gl-native | 0 | ||||
| -rw-r--r-- | src/configure.cmake | 20 | ||||
| -rw-r--r-- | src/plugins/geoservices/CMakeLists.txt | 12 |
3 files changed, 23 insertions, 9 deletions
diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native deleted file mode 160000 -Subproject d3101bbc22edd41c9036ea487d4a71eabd97823 diff --git a/src/configure.cmake b/src/configure.cmake index 56f950b5..0f0364a8 100644 --- a/src/configure.cmake +++ b/src/configure.cmake @@ -1,11 +1,19 @@ -# TODO: figure out if we need any condition for that. -# Previously was: "condition": "config.opengl" -qt_feature("location-labs-plugin" PRIVATE - LABEL "Provides experimental QtLocation QML types" +qt_feature("geoservices_osm" PRIVATE + LABEL "Provides access to OpenStreetMap geoservices" CONDITION TRUE ) -qt_feature("geoservices_osm" PRIVATE +qt_feature("geoservices_esri" PRIVATE LABEL "Provides access to OpenStreetMap geoservices" - CONDITION TRUE + CONDITION FALSE +) + +qt_feature("geoservices_mapbox" PRIVATE + LABEL "Provides access to OpenStreetMap geoservices" + CONDITION FALSE +) + +qt_feature("geoservices_nokia" PRIVATE + LABEL "Provides access to OpenStreetMap geoservices" + CONDITION FALSE ) diff --git a/src/plugins/geoservices/CMakeLists.txt b/src/plugins/geoservices/CMakeLists.txt index 9235f3f1..efa1e7f6 100644 --- a/src/plugins/geoservices/CMakeLists.txt +++ b/src/plugins/geoservices/CMakeLists.txt @@ -1,7 +1,13 @@ -add_subdirectory(esri) add_subdirectory(itemsoverlay) -add_subdirectory(mapbox) -add_subdirectory(nokia) if(QT_FEATURE_geoservices_osm) add_subdirectory(osm) endif() +if(QT_FEATURE_geoservices_esri) + add_subdirectory(esri) +endif() +if(QT_FEATURE_geoservices_mapbox) + add_subdirectory(mapbox) +endif() +if(QT_FEATURE_geoservices_nokia) + add_subdirectory(nokia) +endif() |