Fix location doc file names clash

Original patch from Tapio Nieminen:

The attached patch solves the bug by taking the non-api-breaking choice: group
qml-location is renamed to group qml-location-plugin. Additionally, this patch
adds a list of qml-location-maps elements to qml-mobility-elements.html because
they were missing from that page. This patch changes only documentation, not
binaries. Please review and integrate.

Task-number: NB#278767

8 files changed, 10 insertions, 9 deletions

diff --git a/doc/src/plugins/qml-location.qdoc b/doc/src/plugins/qml-location.qdoc
index 44afc7b4d2..f4990cf9d9 100644
--- a/doc/src/plugins/qml-location.qdoc
+++ b/doc/src/plugins/qml-location.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \group qml-location
+    \group qml-location-plugin
     \title QML Location Plugin
     QML Support for the QtMobility Project Location API.
 */
@@ -72,7 +72,7 @@
     \section2 Positioning Elements
 
 
-    \annotatedlist qml-location
+    \annotatedlist qml-location-plugin
 
     \section1 Maps
 
diff --git a/doc/src/qml-mobility-elements.qdoc b/doc/src/qml-mobility-elements.qdoc
index 14c3f5e90a..3058ff2507 100644
--- a/doc/src/qml-mobility-elements.qdoc
+++ b/doc/src/qml-mobility-elements.qdoc
@@ -51,7 +51,8 @@
     \annotatedlist  qml-gallery
 
     \section1 Location Plugin
-    \annotatedlist qml-location
+    \annotatedlist qml-location-plugin
+    \annotatedlist qml-location-maps
     \annotatedlist qml-location-landmarks
 
     \section1 Messaging Plugin
diff --git a/plugins/declarative/location/qdeclarativecoordinate.cpp b/plugins/declarative/location/qdeclarativecoordinate.cpp
index 1c304789a7..e4aafbea39 100644
--- a/plugins/declarative/location/qdeclarativecoordinate.cpp
+++ b/plugins/declarative/location/qdeclarativecoordinate.cpp
@@ -53,7 +53,7 @@ QTM_BEGIN_NAMESPACE
     \inherits QObject
     \since Mobility 1.2
 
-    \ingroup qml-location
+    \ingroup qml-location-plugin
 
     The Coordinate element is part of the \bold{QtMobility.location 1.1} module.
 */
diff --git a/plugins/declarative/location/qdeclarativegeoaddress.cpp b/plugins/declarative/location/qdeclarativegeoaddress.cpp
index 83a0d16763..1cef047fc5 100644
--- a/plugins/declarative/location/qdeclarativegeoaddress.cpp
+++ b/plugins/declarative/location/qdeclarativegeoaddress.cpp
@@ -46,7 +46,7 @@ QTM_BEGIN_NAMESPACE
 /*!
     \qmlclass Address QDeclarativeGeoAddress
     \brief The Address element presents an address.
-    \ingroup qml-location
+    \ingroup qml-location-plugin
     \since Mobility 1.2
 
     The Address element presents an address of a location.
diff --git a/plugins/declarative/location/qdeclarativegeoboundingbox.cpp b/plugins/declarative/location/qdeclarativegeoboundingbox.cpp
index 3031ac5eb4..7213418373 100644
--- a/plugins/declarative/location/qdeclarativegeoboundingbox.cpp
+++ b/plugins/declarative/location/qdeclarativegeoboundingbox.cpp
@@ -47,7 +47,7 @@ QTM_BEGIN_NAMESPACE
 /*!
     \qmlclass BoundingBox QDeclarativeGeoBoundingBox
     \brief The QGeoBoundingBox class defines a rectangular geographic area.
-    \ingroup qml-location
+    \ingroup qml-location-plugin
     \since Mobility 1.2
 
     The BoundingBox class defines a rectangular geographic area.
diff --git a/plugins/declarative/location/qdeclarativegeoplace.cpp b/plugins/declarative/location/qdeclarativegeoplace.cpp
index 261b9fbbcd..a5d043848d 100644
--- a/plugins/declarative/location/qdeclarativegeoplace.cpp
+++ b/plugins/declarative/location/qdeclarativegeoplace.cpp
@@ -46,7 +46,7 @@ QTM_BEGIN_NAMESPACE
 /*!
     \qmlclass Place QDeclarativeGeoPlace
     \brief The A Place element presents basic information about a place.
-    \ingroup qml-location
+    \ingroup qml-location-plugin
     \since Mobility 1.2
 
     This element is part of the \bold{QtMobility.location 1.1} module.
diff --git a/plugins/declarative/location/qdeclarativeposition.cpp b/plugins/declarative/location/qdeclarativeposition.cpp
index 9a0aab33d8..adc16a2152 100644
--- a/plugins/declarative/location/qdeclarativeposition.cpp
+++ b/plugins/declarative/location/qdeclarativeposition.cpp
@@ -53,7 +53,7 @@ QTM_BEGIN_NAMESPACE
     \brief The Position element holds various positional data, such as coordinate
     (longitude, latitude, altitude) and speed.
     \inherits QObject
-    \ingroup qml-location
+    \ingroup qml-location-plugin
     \since Mobility 1.2
 
     The Position element holds various positional data, such as \l coordinate,
diff --git a/plugins/declarative/location/qdeclarativepositionsource.cpp b/plugins/declarative/location/qdeclarativepositionsource.cpp
index 31c4f0eee7..a0f6c1df30 100644
--- a/plugins/declarative/location/qdeclarativepositionsource.cpp
+++ b/plugins/declarative/location/qdeclarativepositionsource.cpp
@@ -60,7 +60,7 @@ QTM_BEGIN_NAMESPACE
     current position.
     \inherits QObject
 
-    \ingroup qml-location
+    \ingroup qml-location-plugin
     \since Mobility 1.2
 
     The PositionSource element allows you to get information about your current position.