summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/location/CMakeLists.txt2
-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 f4bc5c8f..886a804f 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
@@ -127,7 +128,6 @@ qt_internal_add_module(Location
declarativeplaces/qdeclarativesearchsuggestionmodel_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