Finalize QtLocation CMake build

Add missing files from declarativemaps and declarativeplaces.

Reintroduce Qt.labs.location feature (currently always enabled, as
I'm not sure that OpenGL is strictly required for now).
Build Qt.location.labs as part of QtLocation lib when this feature
is enabled.
Also update build files for plugins to take this feature into account.

Build QML plugins as two separate QML modules. This still requires
some improvements because the code does not use QML_* macros, but
an old-style qmlRegister* approach.

Task-number: QTBUG-96795
Change-Id: Ib835848ca3ad551cc6d858d2bae10b9aa4df5160
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>

6 files changed, 33 insertions, 1 deletions

diff --git a/src/plugins/geoservices/CMakeLists.txt b/src/plugins/geoservices/CMakeLists.txt
index b240732a..9235f3f1 100644
--- a/src/plugins/geoservices/CMakeLists.txt
+++ b/src/plugins/geoservices/CMakeLists.txt
@@ -2,4 +2,6 @@ add_subdirectory(esri)
 add_subdirectory(itemsoverlay)
 add_subdirectory(mapbox)
 add_subdirectory(nokia)
-add_subdirectory(osm)
+if(QT_FEATURE_geoservices_osm)
+    add_subdirectory(osm)
+endif()
diff --git a/src/plugins/geoservices/esri/CMakeLists.txt b/src/plugins/geoservices/esri/CMakeLists.txt
index faae9b50..73eb89e0 100644
--- a/src/plugins/geoservices/esri/CMakeLists.txt
+++ b/src/plugins/geoservices/esri/CMakeLists.txt
@@ -30,3 +30,9 @@ qt_internal_extend_target(GeoServiceProviderFactoryEsriPlugin
     SOURCES
         ${plugin_resource_files}
 )
+
+qt_internal_extend_target(GeoServiceProviderFactoryEsriPlugin
+    CONDITION QT_FEATURE_location_labs_plugin
+    DEFINES
+        LOCATIONLABS
+)
diff --git a/src/plugins/geoservices/itemsoverlay/CMakeLists.txt b/src/plugins/geoservices/itemsoverlay/CMakeLists.txt
index 7de50b93..25ab9d8d 100644
--- a/src/plugins/geoservices/itemsoverlay/CMakeLists.txt
+++ b/src/plugins/geoservices/itemsoverlay/CMakeLists.txt
@@ -11,3 +11,9 @@ qt_internal_add_plugin(QGeoServiceProviderFactoryItemsOverlayPlugin
         Qt::LocationPrivate
         Qt::PositioningPrivate
 )
+
+qt_internal_extend_target(QGeoServiceProviderFactoryItemsOverlayPlugin
+    CONDITION QT_FEATURE_location_labs_plugin
+    DEFINES
+        LOCATIONLABS
+)
diff --git a/src/plugins/geoservices/mapbox/CMakeLists.txt b/src/plugins/geoservices/mapbox/CMakeLists.txt
index d005fd3c..0080ee05 100644
--- a/src/plugins/geoservices/mapbox/CMakeLists.txt
+++ b/src/plugins/geoservices/mapbox/CMakeLists.txt
@@ -30,3 +30,9 @@ qt_internal_extend_target(QGeoServiceProviderFactoryMapboxPlugin
     SOURCES
         ${plugin_resource_files}
 )
+
+qt_internal_extend_target(QGeoServiceProviderFactoryMapboxPlugin
+    CONDITION QT_FEATURE_location_labs_plugin
+    DEFINES
+        LOCATIONLABS
+)
diff --git a/src/plugins/geoservices/nokia/CMakeLists.txt b/src/plugins/geoservices/nokia/CMakeLists.txt
index c7d23304..9eac5e6b 100644
--- a/src/plugins/geoservices/nokia/CMakeLists.txt
+++ b/src/plugins/geoservices/nokia/CMakeLists.txt
@@ -44,3 +44,9 @@ qt_internal_extend_target(QGeoServiceProviderFactoryNokiaPlugin
     SOURCES
         ${plugin_resource_files}
 )
+
+qt_internal_extend_target(QGeoServiceProviderFactoryNokiaPlugin
+    CONDITION QT_FEATURE_location_labs_plugin
+    DEFINES
+        LOCATIONLABS
+)
diff --git a/src/plugins/geoservices/osm/CMakeLists.txt b/src/plugins/geoservices/osm/CMakeLists.txt
index 276af536..ad6811b5 100644
--- a/src/plugins/geoservices/osm/CMakeLists.txt
+++ b/src/plugins/geoservices/osm/CMakeLists.txt
@@ -23,3 +23,9 @@ qt_internal_add_plugin(QGeoServiceProviderFactoryOsmPlugin
         Qt::LocationPrivate
         Qt::PositioningPrivate
 )
+
+qt_internal_extend_target(QGeoServiceProviderFactoryOsmPlugin
+    CONDITION QT_FEATURE_location_labs_plugin
+    DEFINES
+        LOCATIONLABS
+)