Split QtLocation into QtPositioning and QtLocation

QtPositioning is not dependent on any gui component and mostly
covers everything around the retrieval of position information.

QtLocation covers place, map and navigation APIs.

Several documentation issues were fixed during the process.

Change-Id: I98e2a53065549a2fc43f93a75b4f65b5bc884c92
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

13 files changed, 47 insertions, 43 deletions

diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro
index 64e6e1b9..1ed2fd7d 100644
--- a/examples/declarative/declarative.pro
+++ b/examples/declarative/declarative.pro
@@ -1,3 +1,8 @@
 TEMPLATE = subdirs
-SUBDIRS += flickr places places_list places_map
-qtHaveModule(multimedia): SUBDIRS += mapviewer
+
+qtHaveModule(positioning): SUBDIRS += flickr
+
+qtHaveModule(location) {
+    SUBDIRS += places places_list places_map
+    qtHaveModule(multimedia): SUBDIRS += mapviewer
+}
diff --git a/examples/declarative/flickr/flickr.pro b/examples/declarative/flickr/flickr.pro
index 2903c6e3..ff83bcb2 100644
--- a/examples/declarative/flickr/flickr.pro
+++ b/examples/declarative/flickr/flickr.pro
@@ -1,7 +1,7 @@
 TEMPLATE=app
-TARGET = qml_location_flickr
+TARGET = qml_position_flickr
 
-QT += qml quick network location
+QT += qml quick network positioning
 SOURCES += qmllocationflickr.cpp
 
 RESOURCES += \
@@ -9,8 +9,8 @@ RESOURCES += \
 
 OTHER_FILES += flickr.qml
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/flickr
+target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/declarative/flickr
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.qml flickrcommon flickrmobile
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/flickr
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/declarative/flickr
 
 INSTALLS += target sources
diff --git a/examples/declarative/flickr/flickrmobile/GeoTab.qml b/examples/declarative/flickr/flickrmobile/GeoTab.qml
index 4cbffc17..ecfda612 100644
--- a/examples/declarative/flickr/flickrmobile/GeoTab.qml
+++ b/examples/declarative/flickr/flickrmobile/GeoTab.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtLocation 5.0
+import QtPositioning 5.0
 
 Rectangle {
     id: container
diff --git a/examples/declarative/mapviewer/content/map/MapComponent.qml b/examples/declarative/mapviewer/content/map/MapComponent.qml
index 33963968..6f8bca98 100644
--- a/examples/declarative/mapviewer/content/map/MapComponent.qml
+++ b/examples/declarative/mapviewer/content/map/MapComponent.qml
@@ -39,6 +39,7 @@
 ****************************************************************************/
 import QtQuick 2.0
 import QtLocation 5.0
+import QtPositioning 5.0
 import QtLocation.examples 5.0
 
 //! [top]
diff --git a/examples/declarative/mapviewer/mapviewer.qml b/examples/declarative/mapviewer/mapviewer.qml
index f5a05f72..5609821a 100644
--- a/examples/declarative/mapviewer/mapviewer.qml
+++ b/examples/declarative/mapviewer/mapviewer.qml
@@ -40,6 +40,7 @@
 
 import QtQuick 2.0
 import QtLocation 5.0
+import QtPositioning 5.0
 import QtLocation.examples 5.0
 import "content/map"
 import "content/dialogs"
@@ -305,9 +306,9 @@ Item {
             tempGeocodeModel.reset()
             messageDialog.state = ""
             if (routeDialog.byCoordinates) {
-                startCoordinate = QtLocation.coordinate(parseFloat(routeDialog.startLatitude),
+                startCoordinate = QtPositioning.coordinate(parseFloat(routeDialog.startLatitude),
                                                         parseFloat(routeDialog.startLongitude));
-                endCoordinate = QtLocation.coordinate(parseFloat(routeDialog.endLatitude),
+                endCoordinate = QtPositioning.coordinate(parseFloat(routeDialog.endLatitude),
                                                       parseFloat(routeDialog.endLongitude));
 
                 calculateRoute()
@@ -421,7 +422,7 @@ Item {
         onGoButtonClicked: {
             page.state = ""
             messageDialog.state = ""
-            map.geocodeModel.query = QtLocation.coordinate(parseFloat(dialogModel.get(0).inputText),
+            map.geocodeModel.query = QtPositioning.coordinate(parseFloat(dialogModel.get(0).inputText),
                                                            parseFloat(dialogModel.get(1).inputText));
             map.geocodeModel.update();
         }
@@ -449,7 +450,7 @@ Item {
             var newLong = parseFloat(dialogModel.get(1).inputText)
 
             if (newLat !== "NaN" && newLong !== "NaN") {
-                var c = QtLocation.coordinate(newLat, newLong);
+                var c = QtPositioning.coordinate(newLat, newLong);
                 if (c.isValid) {
                     map.markers[map.currentMarker].coordinate = c;
                     map.center = c;
diff --git a/examples/declarative/places/content/places/MapComponent.qml b/examples/declarative/places/content/places/MapComponent.qml
index d35bf1fe..bafb38ff 100644
--- a/examples/declarative/places/content/places/MapComponent.qml
+++ b/examples/declarative/places/content/places/MapComponent.qml
@@ -39,6 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
+import QtPositioning 5.0
 import QtLocation 5.0
 import QtLocation.examples 5.0
 
diff --git a/examples/declarative/places/content/places/PlaceDialog.qml b/examples/declarative/places/content/places/PlaceDialog.qml
index c64c121b..ed08716d 100644
--- a/examples/declarative/places/content/places/PlaceDialog.qml
+++ b/examples/declarative/places/content/places/PlaceDialog.qml
@@ -132,7 +132,7 @@ Dialog {
         locationPlace.location.address.country = dataFieldsModel.get(7).inputText;
         locationPlace.location.address.postalCode = dataFieldsModel.get(8).inputText;
 
-        var c = QtLocation.coordinate(parseFloat(dataFieldsModel.get(9).inputText),
+        var c = QtPositioning.coordinate(parseFloat(dataFieldsModel.get(9).inputText),
                                       parseFloat(dataFieldsModel.get(10).inputText));
         locationPlace.location.coordinate = c;
         var phone = Qt.createQmlObject('import QtLocation 5.0; ContactDetail { }', locationPlace);
diff --git a/examples/declarative/places/places.qml b/examples/declarative/places/places.qml
index 2df5b538..2d2ca749 100644
--- a/examples/declarative/places/places.qml
+++ b/examples/declarative/places/places.qml
@@ -39,6 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
+import QtPositioning 5.0
 import QtLocation 5.0
 import QtLocation.examples 5.0
 import "content/places"
@@ -49,7 +50,7 @@ Item {
     height: (parent && parent.height > 0) ? parent.height : 640
     property variant map
     property variant startLocation
-    property variant searchRegion: QtLocation.circle(startLocation)
+    property variant searchRegion: QtPositioning.circle(startLocation)
     property variant searchRegionItem
     property Plugin favoritesPlugin
 
@@ -58,7 +59,7 @@ Item {
     Binding {
         target: page
         property: "startLocation"
-        value: map ? map.center : QtLocation.coordinate()
+        value: map ? map.center : QtPositioning.coordinate()
     }
 
     Rectangle {
@@ -212,12 +213,12 @@ Item {
 
         onCancelButtonClicked: page.state = ""
         onGoButtonClicked: {
-            var c = QtLocation.coordinate(parseFloat(dialogModel.get(0).inputText),
+            var c = QtPositioning.coordinate(parseFloat(dialogModel.get(0).inputText),
                                           parseFloat(dialogModel.get(1).inputText));
 
             map.center = c;
 
-            searchRegion = Qt.binding(function() { return QtLocation.circle(startLocation) });
+            searchRegion = Qt.binding(function() { return QtPositioning.circle(startLocation) });
 
             if (searchRegionItem) {
                 map.removeMapItem(searchRegionItem);
@@ -249,9 +250,9 @@ Item {
 
         onCancelButtonClicked: page.state = ""
         onGoButtonClicked: {
-            var c = QtLocation.coordinate(parseFloat(dialogModel.get(0).inputText),
+            var c = QtPositioning.coordinate(parseFloat(dialogModel.get(0).inputText),
                                           parseFloat(dialogModel.get(1).inputText));
-            var r = QtLocation.rectangle(c, parseFloat(dialogModel.get(2).inputText),
+            var r = QtPositioning.rectangle(c, parseFloat(dialogModel.get(2).inputText),
                                          parseFloat(dialogModel.get(3).inputText));
 
             map.center = c;
@@ -292,9 +293,9 @@ Item {
 
         onCancelButtonClicked: page.state = ""
         onGoButtonClicked: {
-            var c = QtLocation.coordinate(parseFloat(dialogModel.get(0).inputText),
+            var c = QtPositioning.coordinate(parseFloat(dialogModel.get(0).inputText),
                                           parseFloat(dialogModel.get(1).inputText));
-            var circle = QtLocation.circle(c, parseFloat(dialogModel.get(2).inputText));
+            var circle = QtPositioning.circle(c, parseFloat(dialogModel.get(2).inputText));
 
             map.center = c;
 
@@ -519,7 +520,7 @@ Item {
             MapItemView {
                 model: placeSearchModel
                 delegate: MapQuickItem {
-                    coordinate: model.type === PlaceSearchModel.PlaceResult ? place.location.coordinate : QtLocation.coordinate()
+                    coordinate: model.type === PlaceSearchModel.PlaceResult ? place.location.coordinate : QtPositioning.coordinate()
 
                     visible: model.type === PlaceSearchModel.PlaceResult
 
diff --git a/examples/declarative/places_list/places_list.qml b/examples/declarative/places_list/places_list.qml
index be7849b7..92808159 100644
--- a/examples/declarative/places_list/places_list.qml
+++ b/examples/declarative/places_list/places_list.qml
@@ -40,12 +40,14 @@
 
 //! [Imports]
 import QtQuick 2.0
+import QtPositioning 5.0
 import QtLocation 5.0
 //! [Imports]
 
 Rectangle {
     width: 360
     height: 360
+    property variant startCoordinate: QtPositioning.coordinate(-27.46778, 153.02778)
 
     //! [Initialize Plugin]
     Plugin {
@@ -65,13 +67,7 @@ Rectangle {
         plugin: myPlugin
 
         searchTerm: "pizza"
-        searchArea: GeoCircle {
-            center {
-                // Brisbane
-                longitude: 153.02778
-                latitude: -27.46778
-            }
-        }
+        searchArea: QtPositioning.circle(startCoordinate);
 
         Component.onCompleted: update()
 
diff --git a/examples/declarative/places_map/places_map.qml b/examples/declarative/places_map/places_map.qml
index 29684af4..8ba703ff 100644
--- a/examples/declarative/places_map/places_map.qml
+++ b/examples/declarative/places_map/places_map.qml
@@ -40,6 +40,7 @@
 
 //! [Imports]
 import QtQuick 2.0
+import QtPositioning 5.0
 import QtLocation 5.0
 //! [Imports]
 
@@ -65,13 +66,8 @@ Rectangle {
         plugin: myPlugin
 
         searchTerm: "Pizza"
-        searchArea: GeoCircle {
-            center {
-                // Brisbane
-                longitude: 153.02778
-                latitude: -27.46778
-            }
-        }
+        //Brisbane
+        searchArea: QtPositioning.circle(QtPositioning.coordinate(-27.46778, 153.02778))
 
         Component.onCompleted: update()
     }
diff --git a/examples/examples.pro b/examples/examples.pro
index fa19990e..837e277e 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,4 +1,7 @@
 TEMPLATE = subdirs
 
-qtHaveModule(quick): SUBDIRS += declarative weatherinfo
-qtHaveModule(widgets): SUBDIRS += logfilepositionsource
+qtHaveModule(quick) {
+    SUBDIRS += declarative
+    qtHaveModule(positioning): SUBDIRS += weatherinfo
+}
+qtHaveModule(positioning): qtHaveModule(widgets): SUBDIRS += logfilepositionsource
diff --git a/examples/logfilepositionsource/logfilepositionsource.pro b/examples/logfilepositionsource/logfilepositionsource.pro
index afd7b975..bd00a169 100644
--- a/examples/logfilepositionsource/logfilepositionsource.pro
+++ b/examples/logfilepositionsource/logfilepositionsource.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = logfilepositionsource
-QT = location core widgets
+QT = positioning core widgets
 
 
 HEADERS = logfilepositionsource.h \
@@ -9,8 +9,8 @@ SOURCES = logfilepositionsource.cpp \
           clientapplication.cpp \
           main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/logfilepositionsource
+target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/logfilepositionsource
 sources.files = $$SOURCES $$HEADERS *.pro simplelog.txt
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/logfilepositionsource
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/logfilepositionsource
 
 INSTALLS += target sources
diff --git a/examples/weatherinfo/weatherinfo.pro b/examples/weatherinfo/weatherinfo.pro
index 698115ba..1470b8a0 100644
--- a/examples/weatherinfo/weatherinfo.pro
+++ b/examples/weatherinfo/weatherinfo.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = weatherinfo
 
-QT += core network location qml quick
+QT += core network positioning qml quick
 
 SOURCES += main.cpp \
     appmodel.cpp
@@ -16,7 +16,7 @@ RESOURCES += weatherinfo.qrc
 HEADERS += appmodel.h
 
 #install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/weatherinfo
+target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/weatherinfo
 sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/weatherinfo
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/weatherinfo
 INSTALLS += target sources