1 files changed, 68 insertions, 85 deletions
diff --git a/src/location/CMakeLists.txt b/src/location/CMakeLists.txt
index fbb55ba1..f4bc5c8f 100644
--- a/src/location/CMakeLists.txt
+++ b/src/location/CMakeLists.txt
@@ -1,91 +1,75 @@
 qt_internal_add_module(Location
     PLUGIN_TYPES geoservices
     SOURCES
-        qlocation.h qlocation.cpp qlocationglobal_p.h qlocationglobal.h
-        maps/qgeotiledmapscene.cpp maps/qgeotilerequestmanager.cpp
-        maps/qgeoroute.cpp maps/qgeoroutesegment.cpp maps/qgeocameradata.cpp
-        maps/qgeotilespec.cpp maps/qgeomappingmanagerengine.cpp
-        maps/qnavigationmanagerengine.cpp maps/qgeocameratiles.cpp
-        maps/qgeotilefetcher.cpp maps/qgeocodingmanagerengine.cpp
-        maps/qgeocodingmanager.cpp maps/qgeorouteparserosrmv5.cpp
-        maps/qgeoroutingmanager.cpp maps/qgeofiletilecache.cpp
-        maps/qgeoserviceproviderfactory.cpp maps/qgeomapparameter.cpp
-        maps/qgeomappingmanager.cpp maps/qgeotiledmap.cpp
-        maps/qgeoprojection.cpp maps/qnavigationmanager.cpp
-        maps/qgeotiledmapreply.cpp maps/qgeotiledmappingmanagerengine.cpp
-        maps/qgeomaptype.cpp maps/qgeoserviceprovider.cpp
-        maps/qgeoroutereply.cpp maps/qgeorouteparser.cpp
-        maps/qgeorouterequest.cpp maps/qgeomap.cpp
-        maps/qgeoroutingmanagerengine.cpp maps/qgeorouteparserosrmv4.cpp
-        maps/qgeomaneuver.cpp maps/qgeocameracapabilities.cpp
-        maps/qabstractgeotilecache.cpp maps/qgeocodereply.cpp
-        maps/qgeotilerequestmanager_p.h
-        maps/qgeomaneuver.h maps/qgeotiledmapscene_p_p.h
-        maps/qgeoroutingmanagerengine.h maps/qgeorouterequest.h
-        maps/qgeocodingmanagerengine.h maps/qgeotiledmapreply_p.h
-        maps/qgeorouteparser_p.h maps/qgeocameracapabilities_p.h
-        maps/qgeocameratiles_p.h maps/qgeoroutesegment_p.h
-        maps/qgeocodingmanager_p.h maps/qgeoprojection_p.h
-        maps/qgeotiledmapscene_p.h maps/qgeotilefetcher_p_p.h
-        maps/qgeocodereply_p.h maps/qgeorouteparserosrmv5_p.h
-        maps/qgeorouterequest_p.h maps/qgeocodingmanagerengine_p.h
-        maps/qgeomaptype_p.h maps/qgeorouteparserosrmv4_p.h
-        maps/qgeotilespec_p_p.h maps/qgeocodingmanager.h
-        maps/qgeoroutesegment.h maps/qgeoroutingmanager.h
-        maps/qgeotiledmappingmanagerengine_p.h maps/qgeotilefetcher_p.h
-        maps/qgeomaptype_p_p.h maps/qgeocameratiles_p_p.h
-        maps/qgeoserviceprovider.h maps/qgeotiledmap_p_p.h
-        maps/qgeorouteparser_p_p.h maps/qgeomaneuver_p.h
-        maps/qgeocameradata_p.h maps/qgeomappingmanagerengine_p.h
-        maps/qabstractgeotilecache_p.h maps/qgeofiletilecache_p.h
-        maps/qcache3q_p.h maps/qgeomappingmanagerengine_p_p.h
-        maps/qgeotilespec_p.h maps/qgeomappingmanager_p_p.h
-        maps/qgeotiledmap_p.h maps/qnavigationmanagerengine_p.h
-        maps/qgeoroute.h maps/qgeoroutingmanager_p.h
-        maps/qgeomapparameter_p.h maps/qgeoroutereply.h
-        maps/qgeoroute_p.h maps/qgeoserviceproviderfactory.h
-        maps/qgeomappingmanager_p.h maps/qgeotiledmappingmanagerengine_p_p.h
-        maps/qgeoserviceprovider_p.h maps/qnavigationmanager_p.h
-        maps/qgeotiledmapreply_p_p.h maps/qgeoroutereply_p.h
-        maps/qgeocodereply.h maps/qgeomap_p_p.h
-        maps/qgeoroutingmanagerengine_p.h maps/qgeomap_p.h
-        places/qplacesearchrequest.cpp places/qplaceicon.cpp
-        places/qplacematchrequest.cpp places/qplacemanager.cpp
-        places/qplacecategory.cpp places/qplaceuser.cpp
-        places/qplacesearchresult.cpp places/qplacemanagerengine.cpp
-        places/qplacecontentreply.cpp
-        places/qplacecontentrequest.cpp places/qplacesearchreply.cpp
-        places/qplacereply.cpp places/qplacedetailsreply.cpp
-        places/qplaceratings.cpp places/qplacecontactdetail.cpp
+        qlocation.h qlocation.cpp
+        qlocationglobal.h qlocationglobal_p.h
+        maps/qgeoserviceprovider.h maps/qgeoserviceprovider_p.h maps/qgeoserviceprovider.cpp
+        maps/qgeoserviceproviderfactory.h maps/qgeoserviceproviderfactory.cpp
+        maps/qcache3q_p.h
+        maps/qabstractgeotilecache_p.h maps/qabstractgeotilecache.cpp
+        maps/qgeofiletilecache_p.h maps/qgeofiletilecache.cpp
+        maps/qgeotilespec_p.h maps/qgeotilespec_p_p.h maps/qgeotilespec.cpp
+        maps/qgeotiledmapscene_p.h maps/qgeotiledmapscene_p_p.h maps/qgeotiledmapscene.cpp
+        maps/qgeotilerequestmanager_p.h maps/qgeotilerequestmanager.cpp
+        maps/qgeotilefetcher_p.h maps/qgeotilefetcher_p_p.h maps/qgeotilefetcher.cpp
+        maps/qgeotiledmap_p.h maps/qgeotiledmap_p_p.h maps/qgeotiledmap.cpp
+        maps/qgeotiledmapreply_p.h maps/qgeotiledmapreply_p_p.h maps/qgeotiledmapreply.cpp
+        maps/qgeotiledmappingmanagerengine_p.h maps/qgeotiledmappingmanagerengine_p_p.h
+        maps/qgeotiledmappingmanagerengine.cpp
+        maps/qgeocameradata_p.h maps/qgeocameradata.cpp
+        maps/qgeocameracapabilities_p.h maps/qgeocameracapabilities.cpp
+        maps/qgeocameratiles_p.h maps/qgeocameratiles_p_p.h maps/qgeocameratiles.cpp
+        maps/qgeocodingmanagerengine.h maps/qgeocodingmanagerengine_p.h
+        maps/qgeocodingmanagerengine.cpp
+        maps/qgeocodingmanager.h maps/qgeocodingmanager_p.h maps/qgeocodingmanager.cpp
+        maps/qgeocodereply.h maps/qgeocodereply_p.h maps/qgeocodereply.cpp
+        maps/qgeoroutingmanager.h maps/qgeoroutingmanager_p.h maps/qgeoroutingmanager.cpp
+        maps/qgeoroutingmanagerengine_p.h maps/qgeoroutingmanagerengine.h
+        maps/qgeoroutingmanagerengine.cpp
+        maps/qgeorouterequest.h maps/qgeorouterequest_p.h maps/qgeorouterequest.cpp
+        maps/qgeoroutereply.h maps/qgeoroutereply_p.h maps/qgeoroutereply.cpp
+        maps/qgeoroute.h maps/qgeoroute_p.h maps/qgeoroute.cpp
+        maps/qgeoroutesegment.h maps/qgeoroutesegment_p.h maps/qgeoroutesegment.cpp
+        maps/qgeorouteparser_p.h maps/qgeorouteparser_p_p.h maps/qgeorouteparser.cpp
+        maps/qgeorouteparserosrmv4_p.h maps/qgeorouteparserosrmv4.cpp
+        maps/qgeorouteparserosrmv5_p.h maps/qgeorouteparserosrmv5.cpp
+        maps/qgeomaneuver.h maps/qgeomaneuver_p.h maps/qgeomaneuver.cpp
+        maps/qgeomappingmanager_p.h maps/qgeomappingmanager_p_p.h maps/qgeomappingmanager.cpp
+        maps/qgeomappingmanagerengine_p.h maps/qgeomappingmanagerengine_p_p.h
+        maps/qgeomappingmanagerengine.cpp
+        maps/qgeomaptype_p.h maps/qgeomaptype_p_p.h maps/qgeomaptype.cpp
+        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/qnavigationmanagerengine_p.h maps/qnavigationmanagerengine.cpp
+        maps/qnavigationmanager_p.h maps/qnavigationmanager.cpp
+        places/qplacemanager.h places/qplacemanager.cpp
+        places/qplacemanagerengine.h places/qplacemanagerengine_p.h places/qplacemanagerengine.cpp
+        places/unsupportedreplies_p.h
+        places/qplacereply.h places/qplacereply_p.h places/qplacereply.cpp
+        places/qplaceresult.h places/qplaceresult_p.h places/qplaceresult.cpp
+        places/qplacesearchrequest.h places/qplacesearchrequest_p.h places/qplacesearchrequest.cpp
+        places/qplacesearchreply.h places/qplacesearchreply.cpp
+        places/qplacesearchresult.h places/qplacesearchresult_p.h places/qplacesearchresult.cpp
+        places/qplaceproposedsearchresult.h places/qplaceproposedsearchresult_p.h
         places/qplaceproposedsearchresult.cpp
-        places/qplace.cpp places/qplacesupplier.cpp
-        places/qplaceattribute.cpp
-        places/qplacesearchsuggestionreply.cpp places/qplaceresult.cpp
-        places/qplacematchreply.cpp places/qplacecontent.cpp
-        places/qplaceidreply.cpp
-        places/qplaceicon.h places/qplaceuser.h
-        places/qplaceattribute_p.h places/qplacematchrequest.h
-        places/qplacecontentreply.h
-        places/qplacecategory.h places/qplacesearchrequest.h
-        places/qplacecategory_p.h
-        places/qplaceproposedsearchresult.h places/qplacemanagerengine.h
-        places/qplacecontentrequest.h places/qplacemanagerengine_p.h
-        places/qplace.h places/qplacecontentrequest_p.h
-        places/qplaceattribute.h
-        places/qplacedetailsreply.h
-        places/qplaceratings_p.h places/unsupportedreplies_p.h
-        places/qplacereply.h places/qplace_p.h places/qplaceresult_p.h
-        places/qplacemanager.h places/qplacereply_p.h
-        places/qplacesearchresult_p.h places/qplaceresult.h
-        places/qplacematchreply.h
-        places/qplacecontent.h places/qplacesearchreply.h
-        places/qplacesupplier_p.h places/qplaceratings.h
-        places/qplacesearchresult.h
-        places/qplaceidreply.h places/qplaceuser_p.h places/qplaceicon_p.h
-        places/qplacecontactdetail.h places/qplacesearchsuggestionreply.h
-        places/qplacecontent_p.h places/qplacesearchrequest_p.h
-        places/qplaceproposedsearchresult_p.h places/qplacesupplier.h
-        places/qplacecontactdetail_p.h
+        places/qplacesearchsuggestionreply.h places/qplacesearchsuggestionreply.cpp
+        places/qplacematchrequest.h places/qplacematchrequest.cpp
+        places/qplacematchreply.h places/qplacematchreply.cpp
+        places/qplacecontentrequest.h places/qplacecontentrequest_p.h
+        places/qplacecontentrequest.cpp
+        places/qplacecontentreply.h places/qplacecontentreply.cpp
+        places/qplacedetailsreply.h places/qplacedetailsreply.cpp
+        places/qplaceidreply.h places/qplaceidreply.cpp
+        places/qplace.h places/qplace_p.h places/qplace.cpp
+        places/qplaceicon.h places/qplaceicon_p.h places/qplaceicon.cpp
+        places/qplacecategory.h places/qplacecategory_p.h places/qplacecategory.cpp
+        places/qplaceuser_p.h places/qplaceuser.h places/qplaceuser.cpp
+        places/qplacesupplier.h places/qplacesupplier_p.h places/qplacesupplier.cpp
+        places/qplaceattribute.h places/qplaceattribute_p.h places/qplaceattribute.cpp
+        places/qplaceratings.h places/qplaceratings_p.h places/qplaceratings.cpp
+        places/qplacecontactdetail.h places/qplacecontactdetail_p.h places/qplacecontactdetail.cpp
+        places/qplacecontent.h places/qplacecontent_p.h places/qplacecontent.cpp
         declarativemaps/qdeclarativegeomapitembase_p.h
         declarativemaps/qdeclarativegeomapitembase.cpp
         declarativemaps/qdeclarativegeomap_p.h declarativemaps/qdeclarativegeomap.cpp
@@ -176,7 +160,6 @@ qt_internal_add_module(Location
 qt_internal_extend_target(Location CONDITION QT_FEATURE_location_labs_plugin
     SOURCES
         labs/qdeclarativenavigator.cpp labs/qdeclarativenavigator_p.h labs/qdeclarativenavigator_p_p.h
-#        labs/qgeojson.cpp labs/qgeojson_p.h
         labs/qgeotiledmaplabs.cpp labs/qgeotiledmaplabs_p.h
         labs/qmapcircleobject.cpp labs/qmapcircleobject_p.h labs/qmapcircleobject_p_p.h
         labs/qmapiconobject.cpp labs/qmapiconobject_p.h labs/qmapiconobject_p_p.h