diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-09-21 09:42:27 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-09-27 15:46:04 +0200 |
| commit | 19bdb8d7dba356cde332830569ba17ef093cfc63 (patch) | |
| tree | ca81fae746819259755b76225396df3d3349004c | |
| parent | f3cf9c92dce84b0c5ffa3e66c60b683293306808 (diff) | |
Move the GeoJSON parser out of labs
It's used in the OSM plugin and has been built as part of the core
library for a while. It's not public API, but there is a dedicated
geojson viewer example demonstrating the functionality.
Change-Id: I8f26906d9d1c601d481fec0d503af4dae34ada4d
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit f7dd8156e735e28630ab18b98cd18ca7d2ccc459)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | src/location/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/location/maps/qgeojson.cpp (renamed from src/location/labs/qgeojson.cpp) | 0 | ||||
| -rw-r--r-- | src/location/maps/qgeojson_p.h (renamed from src/location/labs/qgeojson_p.h) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/src/location/CMakeLists.txt b/src/location/CMakeLists.txt index c2d196b1..5154558d 100644 --- a/src/location/CMakeLists.txt +++ b/src/location/CMakeLists.txt @@ -41,6 +41,7 @@ qt_internal_add_module(Location maps/qgeomap_p.h maps/qgeomap_p_p.h maps/qgeomap.cpp maps/qgeomapparameter_p.h maps/qgeomapparameter.cpp maps/qgeoprojection_p.h maps/qgeoprojection.cpp + maps/qgeojson_p.h maps/qgeojson.cpp maps/qnavigationmanagerengine_p.h maps/qnavigationmanagerengine.cpp maps/qnavigationmanager_p.h maps/qnavigationmanager.cpp places/qplacemanager.h places/qplacemanager.cpp @@ -150,7 +151,6 @@ qt_internal_add_module(Location declarativeplaces/qdeclarativesupplier_p.h declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h - labs/qgeojson_p.h labs/qgeojson.cpp INCLUDE_DIRECTORIES maps places diff --git a/src/location/labs/qgeojson.cpp b/src/location/maps/qgeojson.cpp index 423615ad..423615ad 100644 --- a/src/location/labs/qgeojson.cpp +++ b/src/location/maps/qgeojson.cpp diff --git a/src/location/labs/qgeojson_p.h b/src/location/maps/qgeojson_p.h index 30997433..30997433 100644 --- a/src/location/labs/qgeojson_p.h +++ b/src/location/maps/qgeojson_p.h |