Merge branch 'master' into 1.2.0v1.2.0

76 files changed, 176 insertions, 98 deletions

diff --git a/src/location/landmarks/qlandmark.cpp b/src/location/landmarks/qlandmark.cpp
index a16a6198fa..ff503ea144 100644
--- a/src/location/landmarks/qlandmark.cpp
+++ b/src/location/landmarks/qlandmark.cpp
@@ -155,6 +155,7 @@ bool QLandmarkPrivate::operator== (const QLandmarkPrivate &other) const
     \inmodule QtLocation
 
     \ingroup landmarks-main
+    \since 1.1
 
     \brief The QLandmark class represents a point of interest.
 
diff --git a/src/location/landmarks/qlandmarkabstractrequest.cpp b/src/location/landmarks/qlandmarkabstractrequest.cpp
index 7d3185a1b2..afc97f43b4 100644
--- a/src/location/landmarks/qlandmarkabstractrequest.cpp
+++ b/src/location/landmarks/qlandmarkabstractrequest.cpp
@@ -63,6 +63,7 @@ QLandmarkAbstractRequestPrivate::QLandmarkAbstractRequestPrivate(QLandmarkManage
 
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup landmarks-request
 
diff --git a/src/location/landmarks/qlandmarkattributefilter.cpp b/src/location/landmarks/qlandmarkattributefilter.cpp
index fb4d8cd9e6..5023bb14a3 100644
--- a/src/location/landmarks/qlandmarkattributefilter.cpp
+++ b/src/location/landmarks/qlandmarkattributefilter.cpp
@@ -98,6 +98,7 @@ QLandmarkAttributeFilterPrivate::~QLandmarkAttributeFilterPrivate()
     \inmodule QtLocation
 
     \ingroup landmarks-filter
+    \since 1.1
 
     You can provide various keys which describe the attribute(s) to search.
     Precisely which keys may be used depends on the manager
diff --git a/src/location/landmarks/qlandmarkboxfilter.cpp b/src/location/landmarks/qlandmarkboxfilter.cpp
index 7e1613c51c..d135ab1151 100644
--- a/src/location/landmarks/qlandmarkboxfilter.cpp
+++ b/src/location/landmarks/qlandmarkboxfilter.cpp
@@ -52,6 +52,7 @@ QTM_BEGIN_NAMESPACE
     \inmodule QtLocation
 
     \ingroup landmarks-filter
+    \since 1.1
 
     In order to be a valid filter, the region covered by the box filter must not cover one of the poles.
 */
diff --git a/src/location/landmarks/qlandmarkcategory.cpp b/src/location/landmarks/qlandmarkcategory.cpp
index 182a7564d0..d8d6907509 100644
--- a/src/location/landmarks/qlandmarkcategory.cpp
+++ b/src/location/landmarks/qlandmarkcategory.cpp
@@ -104,6 +104,7 @@ bool QLandmarkCategoryPrivate::operator == (const QLandmarkCategoryPrivate &othe
     \inmodule QtLocation
 
     \ingroup landmarks-main
+    \since 1.1
 
     Landmarks of similar type may be grouped together into categories,
     e.g. restaurants, accommodation etc,  a QLandmarkCategory object
diff --git a/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.cpp b/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.cpp
index a4a2a73531..3801b6dd54 100644
--- a/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.cpp
+++ b/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.cpp
@@ -68,6 +68,7 @@ QTM_BEGIN_NAMESPACE
     \inmodule QtLocation
 
     \ingroup landmarks-request
+    \since 1.2
 */
 
 /*!
diff --git a/src/location/landmarks/qlandmarkcategoryfetchrequest.cpp b/src/location/landmarks/qlandmarkcategoryfetchrequest.cpp
index d0d5ca728c..9406594bc3 100644
--- a/src/location/landmarks/qlandmarkcategoryfetchrequest.cpp
+++ b/src/location/landmarks/qlandmarkcategoryfetchrequest.cpp
@@ -59,6 +59,7 @@ QTM_BEGIN_NAMESPACE
     the usage of request classes and ownership semantics.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup landmarks-request
 */
diff --git a/src/location/landmarks/qlandmarkcategoryfilter.cpp b/src/location/landmarks/qlandmarkcategoryfilter.cpp
index fc6fefac4b..0bfeae5f37 100644
--- a/src/location/landmarks/qlandmarkcategoryfilter.cpp
+++ b/src/location/landmarks/qlandmarkcategoryfilter.cpp
@@ -51,6 +51,7 @@ QTM_BEGIN_NAMESPACE
     belong to a certain category.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup landmarks-filter
 */
diff --git a/src/location/landmarks/qlandmarkcategoryid.cpp b/src/location/landmarks/qlandmarkcategoryid.cpp
index c0e70a022e..ba08fba6d9 100644
--- a/src/location/landmarks/qlandmarkcategoryid.cpp
+++ b/src/location/landmarks/qlandmarkcategoryid.cpp
@@ -49,8 +49,9 @@ QTM_USE_NAMESPACE
     \class QLandmarkCategoryId
 
     \inmodule QtLocation
-    
+
     \ingroup landmarks-main
+    \since 1.1
 
     \brief The QLandmarkCategoryId class provides a unique identifier for
     a category.
diff --git a/src/location/landmarks/qlandmarkcategoryidfetchrequest.cpp b/src/location/landmarks/qlandmarkcategoryidfetchrequest.cpp
index 3c9131d410..ddff967a58 100644
--- a/src/location/landmarks/qlandmarkcategoryidfetchrequest.cpp
+++ b/src/location/landmarks/qlandmarkcategoryidfetchrequest.cpp
@@ -59,6 +59,7 @@ QTM_BEGIN_NAMESPACE
     the usage of request classes and ownership semantics.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup landmarks-request
 */
diff --git a/src/location/landmarks/qlandmarkcategoryremoverequest.cpp b/src/location/landmarks/qlandmarkcategoryremoverequest.cpp
index 0228d09eb6..a310b10988 100644
--- a/src/location/landmarks/qlandmarkcategoryremoverequest.cpp
+++ b/src/location/landmarks/qlandmarkcategoryremoverequest.cpp
@@ -63,6 +63,7 @@ QTM_BEGIN_NAMESPACE
     \inmodule QtLocation
 
     \ingroup landmarks-request
+    \since 1.1
 */
 
 /*!
diff --git a/src/location/landmarks/qlandmarkcategorysaverequest.cpp b/src/location/landmarks/qlandmarkcategorysaverequest.cpp
index 6d70b611d2..3e27fb64eb 100644
--- a/src/location/landmarks/qlandmarkcategorysaverequest.cpp
+++ b/src/location/landmarks/qlandmarkcategorysaverequest.cpp
@@ -61,6 +61,7 @@ QTM_BEGIN_NAMESPACE
     \inmodule QtLocation
 
     \ingroup landmarks-request
+    \since 1.1
 */
 
 /*!
diff --git a/src/location/landmarks/qlandmarkexportrequest.cpp b/src/location/landmarks/qlandmarkexportrequest.cpp
index 717a3b257f..025f0a22e5 100644
--- a/src/location/landmarks/qlandmarkexportrequest.cpp
+++ b/src/location/landmarks/qlandmarkexportrequest.cpp
@@ -65,6 +65,7 @@ QTM_BEGIN_NAMESPACE
     \inmodule QtLocation
 
     \ingroup landmarks-request
+    \since 1.1
 */
 
 /*!
diff --git a/src/location/landmarks/qlandmarkfetchbyidrequest.cpp b/src/location/landmarks/qlandmarkfetchbyidrequest.cpp
index fd00c58062..5a6c88dc41 100644
--- a/src/location/landmarks/qlandmarkfetchbyidrequest.cpp
+++ b/src/location/landmarks/qlandmarkfetchbyidrequest.cpp
@@ -62,6 +62,7 @@ QTM_BEGIN_NAMESPACE
     \inmodule QtLocation
 
     \ingroup landmarks-request
+    \since 1.1
 */
 
 /*!
diff --git a/src/location/landmarks/qlandmarkfetchrequest.cpp b/src/location/landmarks/qlandmarkfetchrequest.cpp
index 8977d9a372..3e8c7d5a24 100644
--- a/src/location/landmarks/qlandmarkfetchrequest.cpp
+++ b/src/location/landmarks/qlandmarkfetchrequest.cpp
@@ -63,6 +63,7 @@ QTM_BEGIN_NAMESPACE
     \inmodule QtLocation
 
     \ingroup landmarks-request
+    \since 1.1
 */
 
 /*!
diff --git a/src/location/landmarks/qlandmarkfilter.cpp b/src/location/landmarks/qlandmarkfilter.cpp
index 465db82a88..9e5566a0af 100644
--- a/src/location/landmarks/qlandmarkfilter.cpp
+++ b/src/location/landmarks/qlandmarkfilter.cpp
@@ -82,6 +82,7 @@ QLandmarkFilterPrivate::~QLandmarkFilterPrivate()
     \inmodule QtLocation
 
     \ingroup landmarks-filter
+    \since 1.1
 
     This class is used as a parameter to search for landmarks, it allows selection of
     landmarks which meet certain criteria.  It is used with QLandmarkManager
diff --git a/src/location/landmarks/qlandmarkid.cpp b/src/location/landmarks/qlandmarkid.cpp
index b4052982c0..f857a3b442 100644
--- a/src/location/landmarks/qlandmarkid.cpp
+++ b/src/location/landmarks/qlandmarkid.cpp
@@ -49,8 +49,9 @@ QTM_USE_NAMESPACE
     \class QLandmarkId
 
     \inmodule QtLocation
-    
+
     \ingroup landmarks-main
+    \since 1.1
 
     \brief The QLandmarkId class provides a unique identifier for
     a landmark.
diff --git a/src/location/landmarks/qlandmarkidfetchrequest.cpp b/src/location/landmarks/qlandmarkidfetchrequest.cpp
index 122ee2dcf6..5353d40346 100644
--- a/src/location/landmarks/qlandmarkidfetchrequest.cpp
+++ b/src/location/landmarks/qlandmarkidfetchrequest.cpp
@@ -60,6 +60,7 @@ QTM_BEGIN_NAMESPACE
     the usage of request classes and ownership semantics.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup landmarks-request
 */
@@ -169,7 +170,7 @@ void QLandmarkIdFetchRequest::setLimit(int limit)
     Returns the index offset for the request.  By default the offset is set to 0.
     The offset determines the first index which is retrieved, it is generally used
     in conjunction with limit() to facilitate paging.
-    
+
     For example, if there are 10 landmarks in the landmark store, setting the offset
     to 2 and limit to 5 will retrieve the 3rd and 7th landmark ids inclusively.  (The order
     of the landmark ids is sepecified by the sorting field).
diff --git a/src/location/landmarks/qlandmarkidfilter.cpp b/src/location/landmarks/qlandmarkidfilter.cpp
index 6a1c0ffc12..35f9d203aa 100644
--- a/src/location/landmarks/qlandmarkidfilter.cpp
+++ b/src/location/landmarks/qlandmarkidfilter.cpp
@@ -52,6 +52,7 @@ QTM_BEGIN_NAMESPACE
     \inmodule QtLocation
 
     \ingroup landmarks-filter
+    \since 1.1
 */
 
 Q_IMPLEMENT_LANDMARKFILTER_PRIVATE(QLandmarkIdFilter)
diff --git a/src/location/landmarks/qlandmarkimportrequest.cpp b/src/location/landmarks/qlandmarkimportrequest.cpp
index a477ff7037..39d7efe324 100644
--- a/src/location/landmarks/qlandmarkimportrequest.cpp
+++ b/src/location/landmarks/qlandmarkimportrequest.cpp
@@ -62,6 +62,7 @@ QTM_BEGIN_NAMESPACE
     supported for import requests and will always return false.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup landmarks-request
 */
diff --git a/src/location/landmarks/qlandmarkintersectionfilter.cpp b/src/location/landmarks/qlandmarkintersectionfilter.cpp
index b18c22fe75..faeffb7294 100644
--- a/src/location/landmarks/qlandmarkintersectionfilter.cpp
+++ b/src/location/landmarks/qlandmarkintersectionfilter.cpp
@@ -52,6 +52,7 @@ QTM_BEGIN_NAMESPACE
     \inmodule QtLocation
 
     \ingroup landmarks-filter
+    \since 1.1
 
     Conceptually it performs an AND operation and thus may be used to
     select landmarks which match all of it's constituent filters.
diff --git a/src/location/landmarks/qlandmarkmanagerengine.cpp b/src/location/landmarks/qlandmarkmanagerengine.cpp
index 6b91c66b44..41bb7dbe51 100644
--- a/src/location/landmarks/qlandmarkmanagerengine.cpp
+++ b/src/location/landmarks/qlandmarkmanagerengine.cpp
@@ -147,6 +147,7 @@ QStringList commonLandmarkKeys = QStringList() << "name"
     of the landmark manager backend functionality.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup landmarks-backend
 
diff --git a/src/location/landmarks/qlandmarknamefilter.cpp b/src/location/landmarks/qlandmarknamefilter.cpp
index b072fa5e76..4c16a716d4 100644
--- a/src/location/landmarks/qlandmarknamefilter.cpp
+++ b/src/location/landmarks/qlandmarknamefilter.cpp
@@ -49,6 +49,7 @@ QTM_BEGIN_NAMESPACE
     \brief The QLandmarkNameFilter class is used to search for landmarks by name.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup landmarks-filter
 
diff --git a/src/location/landmarks/qlandmarknamesort.cpp b/src/location/landmarks/qlandmarknamesort.cpp
index 324f8c919f..29ef320930 100644
--- a/src/location/landmarks/qlandmarknamesort.cpp
+++ b/src/location/landmarks/qlandmarknamesort.cpp
@@ -51,6 +51,7 @@ QTM_BEGIN_NAMESPACE
     \inmodule QtLocation
 
     \ingroup landmarks-sort
+    \since 1.1
 
     Note that some manager's may not support case sensitive sorting.
 */
diff --git a/src/location/landmarks/qlandmarkproximityfilter.cpp b/src/location/landmarks/qlandmarkproximityfilter.cpp
index 7012f532c0..cfe32e296c 100644
--- a/src/location/landmarks/qlandmarkproximityfilter.cpp
+++ b/src/location/landmarks/qlandmarkproximityfilter.cpp
@@ -53,6 +53,7 @@ QTM_BEGIN_NAMESPACE
     \inmodule QtLocation
 
     \ingroup landmarks-filter
+    \since 1.1
 
     In order to be a valid filter, the region covered by the proximity filter must not cover one of the poles.
     The landmarks are returned in ascending order of distance.  A proximity filter may
diff --git a/src/location/landmarks/qlandmarkremoverequest.cpp b/src/location/landmarks/qlandmarkremoverequest.cpp
index f7164f8c0f..6ef90ecf53 100644
--- a/src/location/landmarks/qlandmarkremoverequest.cpp
+++ b/src/location/landmarks/qlandmarkremoverequest.cpp
@@ -61,6 +61,7 @@ QTM_BEGIN_NAMESPACE
     \inmodule QtLocation
 
     \ingroup landmarks-request
+    \since 1.1
 */
 
 /*!
diff --git a/src/location/landmarks/qlandmarksaverequest.cpp b/src/location/landmarks/qlandmarksaverequest.cpp
index 953a3d0dbe..8c5214954b 100644
--- a/src/location/landmarks/qlandmarksaverequest.cpp
+++ b/src/location/landmarks/qlandmarksaverequest.cpp
@@ -54,6 +54,7 @@ QTM_BEGIN_NAMESPACE
     \inmodule QtLocation
 
     \ingroup landmarks-request
+    \since 1.1
 
     For a QLandmarkSaveRequest, the resultsAvailable() signal will be emitted
     when either an individual items error out (individaul errors may be retrieved
diff --git a/src/location/landmarks/qlandmarksortorder.cpp b/src/location/landmarks/qlandmarksortorder.cpp
index 7abb42be6b..74901d571e 100644
--- a/src/location/landmarks/qlandmarksortorder.cpp
+++ b/src/location/landmarks/qlandmarksortorder.cpp
@@ -59,6 +59,7 @@ QTM_BEGIN_NAMESPACE
            no sorting.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup landmarks-sort
 
diff --git a/src/location/landmarks/qlandmarkunionfilter.cpp b/src/location/landmarks/qlandmarkunionfilter.cpp
index 3be3e2dd65..8d792e4a76 100644
--- a/src/location/landmarks/qlandmarkunionfilter.cpp
+++ b/src/location/landmarks/qlandmarkunionfilter.cpp
@@ -50,8 +50,9 @@ QTM_BEGIN_NAMESPACE
             of its constituent filters.
 
     \inmodule QtLocation
-    
+
     \ingroup landmarks-filter
+    \since 1.1
 
     Conceptually it performs an OR operation and may thus be used
     to select landmarks which match any one of it's constituent filters.
diff --git a/src/location/maps/qgeomaneuver.cpp b/src/location/maps/qgeomaneuver.cpp
index 94b676487b..92a2ac2625 100644
--- a/src/location/maps/qgeomaneuver.cpp
+++ b/src/location/maps/qgeomaneuver.cpp
@@ -52,6 +52,7 @@ QTM_BEGIN_NAMESPACE
     point at which two QGeoRouteSegments meet.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-routing
 
@@ -114,8 +115,8 @@ The instruction indicates that the direction of travel should bear to the left.
 /*!
     Constructs a invalid maneuver object.
 
-    The maneuver will remain invalid until one of 
-    setPosition(), setInstructionText(), setDirection(), 
+    The maneuver will remain invalid until one of
+    setPosition(), setInstructionText(), setDirection(),
     setTimeToNextInstruction(), setDistanceToNextInstruction() or
     setWaypoint() is called.
 */
@@ -162,7 +163,7 @@ bool QGeoManeuver::operator!= (const QGeoManeuver &other) const
 /*!
     Returns whether this maneuver is valid or not.
 
-    Invalid maneuvers are used when there is no information 
+    Invalid maneuvers are used when there is no information
     that needs to be attached to the endpoint of a QGeoRouteSegment instance.
 */
 bool QGeoManeuver::isValid() const
diff --git a/src/location/maps/qgeomapcircleobject.cpp b/src/location/maps/qgeomapcircleobject.cpp
index f5e98f8e9a..35ff7747cc 100644
--- a/src/location/maps/qgeomapcircleobject.cpp
+++ b/src/location/maps/qgeomapcircleobject.cpp
@@ -54,6 +54,7 @@ QTM_BEGIN_NAMESPACE
     within a given distance of a coordinate.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-mapping-objects
 
@@ -287,7 +288,7 @@ qreal QGeoMapCircleObject::radius() const
 /*!
 \fn void QGeoMapCircleObject::centerChanged(const QGeoCoordinate &center)
 
-    This signal is emitted when the center of the circle object has 
+    This signal is emitted when the center of the circle object has
     changed.
 
     The new value is \a center.
@@ -296,7 +297,7 @@ qreal QGeoMapCircleObject::radius() const
 /*!
 \fn void QGeoMapCircleObject::radiusChanged(qreal radius)
 
-    This signal is emitted when the radius of the circle object has 
+    This signal is emitted when the radius of the circle object has
     changed.
 
     The new value is \a radius.
@@ -305,7 +306,7 @@ qreal QGeoMapCircleObject::radius() const
 /*!
 \fn void QGeoMapCircleObject::penChanged(const QPen &pen)
 
-    This signal is emitted when the pen used to draw the edge of 
+    This signal is emitted when the pen used to draw the edge of
     the circle object has changed.
 
     The new value is \a pen.
@@ -314,7 +315,7 @@ qreal QGeoMapCircleObject::radius() const
 /*!
 \fn void QGeoMapCircleObject::brushChanged(const QBrush &brush)
 
-    This signal is emitted when the brush used to fill the inside of 
+    This signal is emitted when the brush used to fill the inside of
     the circle object has changed.
 
     The new value is \a brush.
diff --git a/src/location/maps/qgeomapcustomobject.cpp b/src/location/maps/qgeomapcustomobject.cpp
index 032958fec6..d873a428c1 100644
--- a/src/location/maps/qgeomapcustomobject.cpp
+++ b/src/location/maps/qgeomapcustomobject.cpp
@@ -55,6 +55,7 @@ QTM_BEGIN_NAMESPACE
     \inmodule QtLocation
 
     \ingroup maps-mapping-objects
+    \since 1.2
 
     Any arbitrary QGraphicsItem can be associated with a QGeoMapCustomObject, and to
     this end it contains support for interpreting the coordinates of the
diff --git a/src/location/maps/qgeomapdata.cpp b/src/location/maps/qgeomapdata.cpp
index 2da4e6dc94..d6716d02fe 100644
--- a/src/location/maps/qgeomapdata.cpp
+++ b/src/location/maps/qgeomapdata.cpp
@@ -73,6 +73,7 @@ QTM_BEGIN_NAMESPACE
 
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-impl
 
@@ -121,7 +122,7 @@ QGeoMapData::~QGeoMapData()
 }
 
 /*!
-    This function is run after the QGeoMapData instance has been 
+    This function is run after the QGeoMapData instance has been
     constructed.
 
     Any subclasses which override this function should make sure that
@@ -710,7 +711,7 @@ void QGeoMapData::setBlockPropertyChangeSignals(bool block)
 /*!
 \fn void QGeoMapData::windowSizeChanged(const QSizeF &windowSize)
 
-    This signal is emitted when the size of the window which contains 
+    This signal is emitted when the size of the window which contains
     the map has changed.
 
     The new value is \a windowSize.
@@ -759,7 +760,7 @@ void QGeoMapData::setBlockPropertyChangeSignals(bool block)
 /*!
 \fn void QGeoMapData::connectivityModeChanged(QGraphicsGeoMap::ConnectivityMode connectivityMode)
 
-    This signal is emitted when the connectivity mode used to fetch the 
+    This signal is emitted when the connectivity mode used to fetch the
     map data has changed.
 
     The new value is \a connectivityMode.
@@ -768,7 +769,7 @@ void QGeoMapData::setBlockPropertyChangeSignals(bool block)
 /*!
 \fn void QGeoMapData::updateMapDisplay(const QRectF &target)
 
-    This signal is emitted when the region \a target of the window which 
+    This signal is emitted when the region \a target of the window which
     contains the map needs to be updated.
 
 
diff --git a/src/location/maps/qgeomapgroupobject.cpp b/src/location/maps/qgeomapgroupobject.cpp
index 939af440b8..dcd953a22f 100644
--- a/src/location/maps/qgeomapgroupobject.cpp
+++ b/src/location/maps/qgeomapgroupobject.cpp
@@ -59,6 +59,7 @@ QTM_BEGIN_NAMESPACE
     manager a group of other map objects.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-mapping-objects
 
diff --git a/src/location/maps/qgeomapobject.cpp b/src/location/maps/qgeomapobject.cpp
index cd3c6836a9..3c42fc4522 100644
--- a/src/location/maps/qgeomapobject.cpp
+++ b/src/location/maps/qgeomapobject.cpp
@@ -57,6 +57,7 @@ QTM_BEGIN_NAMESPACE
     \class QGeoMapObject
     \brief The QGeoMapObject class is a graphical item to be displayed on a map.
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-mapping-objects
 
@@ -458,7 +459,7 @@ void QGeoMapObject::setUnits(const CoordinateUnit &unit)
 /*!
 \fn void QGeoMapObject::zValueChanged(int zValue)
 
-    This signal is emitted when the z value of the map object 
+    This signal is emitted when the z value of the map object
     has changed.
 
     The new value is \a zValue.
@@ -467,7 +468,7 @@ void QGeoMapObject::setUnits(const CoordinateUnit &unit)
 /*!
 \fn void QGeoMapObject::visibleChanged(bool visible)
 
-    This signal is emitted when the visible state of the map object 
+    This signal is emitted when the visible state of the map object
     has changed.
 
     The new value is \a visible.
diff --git a/src/location/maps/qgeomapobjectinfo.cpp b/src/location/maps/qgeomapobjectinfo.cpp
index 1900820372..e399d47286 100644
--- a/src/location/maps/qgeomapobjectinfo.cpp
+++ b/src/location/maps/qgeomapobjectinfo.cpp
@@ -57,6 +57,7 @@ QTM_BEGIN_NAMESPACE
     particular QGeoMapData subclass.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-impl
 
@@ -101,7 +102,7 @@ QGeoMapObjectInfo::~QGeoMapObjectInfo()
 void QGeoMapObjectInfo::init() {}
 
 /*!
-    This function is called when the window size of the map changes to 
+    This function is called when the window size of the map changes to
     \a windowSize.
 
     The default implementation does nothing.
@@ -112,7 +113,7 @@ void QGeoMapObjectInfo::windowSizeChanged(const QSizeF &windowSize)
 }
 
 /*!
-    This function is called when the zoom level of the map changes to 
+    This function is called when the zoom level of the map changes to
     \a zoomLevel.
 
     The default implementation does nothing.
@@ -123,7 +124,7 @@ void QGeoMapObjectInfo::zoomLevelChanged(qreal zoomLevel)
 }
 
 /*!
-    This function is called when the center of the map changes to 
+    This function is called when the center of the map changes to
     \a coordinate.
 
     The default implementation does nothing.
@@ -144,7 +145,7 @@ void QGeoMapObjectInfo::zValueChanged(int zValue)
 }
 
 /*!
-    This function is run when the visible state of the object changes to 
+    This function is run when the visible state of the object changes to
     \a visible.
 
     The default implementation does nothing.
@@ -155,7 +156,7 @@ void QGeoMapObjectInfo::visibleChanged(bool visible)
 }
 
 /*!
-    This function is run when the selected state of the object changes to 
+    This function is run when the selected state of the object changes to
     \a selected.
 
     The default implementation does nothing.
diff --git a/src/location/maps/qgeomapoverlay.cpp b/src/location/maps/qgeomapoverlay.cpp
index a888e3713b..5d5fa582d5 100644
--- a/src/location/maps/qgeomapoverlay.cpp
+++ b/src/location/maps/qgeomapoverlay.cpp
@@ -51,6 +51,7 @@ QTM_BEGIN_NAMESPACE
     \brief The QGeoMapOverlay class is used to draw overlays on the map.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-mapping
 
diff --git a/src/location/maps/qgeomappingmanager.cpp b/src/location/maps/qgeomappingmanager.cpp
index 36692311ec..3bac9036dc 100644
--- a/src/location/maps/qgeomappingmanager.cpp
+++ b/src/location/maps/qgeomappingmanager.cpp
@@ -54,6 +54,7 @@ QTM_BEGIN_NAMESPACE
     and interacting with maps.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-mapping
 
diff --git a/src/location/maps/qgeomappingmanagerengine.cpp b/src/location/maps/qgeomappingmanagerengine.cpp
index b9cb547ced..72d3002b8d 100644
--- a/src/location/maps/qgeomappingmanagerengine.cpp
+++ b/src/location/maps/qgeomappingmanagerengine.cpp
@@ -53,6 +53,7 @@ QTM_BEGIN_NAMESPACE
     and interacting with maps.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-impl
 
diff --git a/src/location/maps/qgeomappixmapobject.cpp b/src/location/maps/qgeomappixmapobject.cpp
index 51bde21ea6..0109cea4ed 100644
--- a/src/location/maps/qgeomappixmapobject.cpp
+++ b/src/location/maps/qgeomappixmapobject.cpp
@@ -51,6 +51,7 @@ QTM_BEGIN_NAMESPACE
     a pixmap on a map.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-mapping-objects
 
@@ -184,7 +185,7 @@ void QGeoMapPixmapObject::setOffset(const QPoint &offset)
 /*!
 \fn void QGeoMapPixmapObject::coordinateChanged(const QGeoCoordinate &coordinate)
 
-    This signal is emitted when the coordinate at which the pixmap 
+    This signal is emitted when the coordinate at which the pixmap
     should be drawn has changed.
 
     The new value will be \a coordinate.
@@ -192,8 +193,8 @@ void QGeoMapPixmapObject::setOffset(const QPoint &offset)
 
 /*!
 \fn void QGeoMapPixmapObject::pixmapChanged(const QPixmap &pixmap)
-    
-    This signal is emitted when the pixmap associated with this 
+
+    This signal is emitted when the pixmap associated with this
     pixmap object has changed.
 
     The new value will be \a pixmap.
@@ -201,8 +202,8 @@ void QGeoMapPixmapObject::setOffset(const QPoint &offset)
 
 /*!
 \fn void QGeoMapPixmapObject::offsetChanged(const QPoint &offset)
-    
-    This signal is emitted when the on-screen offset from the coordinate 
+
+    This signal is emitted when the on-screen offset from the coordinate
     at which this pixmap object should be drawn has changed.
 
     The new value will be \a offset.
diff --git a/src/location/maps/qgeomappolygonobject.cpp b/src/location/maps/qgeomappolygonobject.cpp
index da34decb7d..d7c5d6b79b 100644
--- a/src/location/maps/qgeomappolygonobject.cpp
+++ b/src/location/maps/qgeomappolygonobject.cpp
@@ -52,6 +52,7 @@ QTM_BEGIN_NAMESPACE
     a polygon on a map.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-mapping-objects
 
@@ -168,7 +169,7 @@ QBrush QGeoMapPolygonObject::brush() const
 /*!
 \fn void QGeoMapPolygonObject::pathChanged(const QList<QGeoCoordinate> &path)
 
-    This signal is emitted when the ordered list of coordinates that define 
+    This signal is emitted when the ordered list of coordinates that define
     the polygon to be drawn by this polygon object has changed.
 
     The new value is \a path.
@@ -177,7 +178,7 @@ QBrush QGeoMapPolygonObject::brush() const
 /*!
 \fn void QGeoMapPolygonObject::penChanged(const QPen &pen)
 
-    This signal is emitted when the pen used to draw the edge of this 
+    This signal is emitted when the pen used to draw the edge of this
     polygon object has changed.
 
     The new value is \a pen.
@@ -186,9 +187,9 @@ QBrush QGeoMapPolygonObject::brush() const
 /*!
 \fn void QGeoMapPolygonObject::brushChanged(const QBrush &brush)
 
-    This signal is emitted when the brush used to fill in the interior of 
+    This signal is emitted when the brush used to fill in the interior of
     this polygon object has changed.
-    
+
     The new value is \a brush.
 */
 
diff --git a/src/location/maps/qgeomappolylineobject.cpp b/src/location/maps/qgeomappolylineobject.cpp
index 4ddb4ee713..96f77bc7d2 100644
--- a/src/location/maps/qgeomappolylineobject.cpp
+++ b/src/location/maps/qgeomappolylineobject.cpp
@@ -52,6 +52,7 @@ QTM_BEGIN_NAMESPACE
     a segmented line on a map.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-mapping-objects
 
@@ -143,7 +144,7 @@ QPen QGeoMapPolylineObject::pen() const
 /*!
 \fn void QGeoMapPolylineObject::pathChanged(const QList<QGeoCoordinate> &path)
 
-    This signal is emitted when the ordered list of coordinates that define 
+    This signal is emitted when the ordered list of coordinates that define
     the polyline to be drawn by this polyline object has changed.
 
     The new value is \a path.
@@ -152,7 +153,7 @@ QPen QGeoMapPolylineObject::pen() const
 /*!
 \fn void QGeoMapPolylineObject::penChanged(const QPen &pen)
 
-    This signal is emitted when the pen used to draw the edge of this 
+    This signal is emitted when the pen used to draw the edge of this
     polyline object has changed.
 
     The new value is \a pen.
diff --git a/src/location/maps/qgeomaprectangleobject.cpp b/src/location/maps/qgeomaprectangleobject.cpp
index 6ba2a0e722..ade4e56473 100644
--- a/src/location/maps/qgeomaprectangleobject.cpp
+++ b/src/location/maps/qgeomaprectangleobject.cpp
@@ -53,6 +53,7 @@ QTM_BEGIN_NAMESPACE
     a rectangular region on a map.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-mapping-objects
 
@@ -249,7 +250,7 @@ void QGeoMapRectangleObject::setBrush(const QBrush &brush)
 /*!
 \fn void QGeoMapRectangleObject::topLeftChanged(const QGeoCoordinate &topLeft)
 
-    This signal is emitted when the top left coordinate of this rectangle 
+    This signal is emitted when the top left coordinate of this rectangle
     object has changed.
 
     The new value is \a topLeft.
@@ -258,7 +259,7 @@ void QGeoMapRectangleObject::setBrush(const QBrush &brush)
 /*!
 \fn void QGeoMapRectangleObject::bottomRightChanged(const QGeoCoordinate &bottomRight)
 
-    This signal is emitted when the bottom right coordinate of this rectangle 
+    This signal is emitted when the bottom right coordinate of this rectangle
     object has changed.
 
     The new value is \a bottomRight.
@@ -267,7 +268,7 @@ void QGeoMapRectangleObject::setBrush(const QBrush &brush)
 /*!
 \fn void QGeoMapRectangleObject::penChanged(const QPen &pen)
 
-    This signal is emitted when the pen used to draw the perimeter of this 
+    This signal is emitted when the pen used to draw the perimeter of this
     rectangle object has changed.
 
     The new value is \a pen.
@@ -276,7 +277,7 @@ void QGeoMapRectangleObject::setBrush(const QBrush &brush)
 /*!
 \fn void QGeoMapRectangleObject::brushChanged(const QBrush &brush)
 
-    This signal is emitted when the brush used to fill in the interior of 
+    This signal is emitted when the brush used to fill in the interior of
     this rectangle object has changed.
 
     The new value is \a brush.
diff --git a/src/location/maps/qgeomaprouteobject.cpp b/src/location/maps/qgeomaprouteobject.cpp
index 1c81f14dfe..3822b87448 100644
--- a/src/location/maps/qgeomaprouteobject.cpp
+++ b/src/location/maps/qgeomaprouteobject.cpp
@@ -54,6 +54,7 @@ QTM_BEGIN_NAMESPACE
     a route on a map.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-mapping-objects
 
@@ -182,7 +183,7 @@ void QGeoMapRouteObject::setDetailLevel(quint32 detailLevel)
 /*!
 \fn void QGeoMapRouteObject::routeChanged(const QGeoRoute &route)
 
-    This signal is emitted when the route drawn by this route object 
+    This signal is emitted when the route drawn by this route object
     has changed.
 
     The new value is \a route.
@@ -191,7 +192,7 @@ void QGeoMapRouteObject::setDetailLevel(quint32 detailLevel)
 /*!
 \fn void QGeoMapRouteObject::penChanged(const QPen &pen)
 
-    This signal is emitted when the pen used to draw this route object has 
+    This signal is emitted when the pen used to draw this route object has
     changed.
 
     The new value is \a pen.
@@ -200,7 +201,7 @@ void QGeoMapRouteObject::setDetailLevel(quint32 detailLevel)
 /*!
 \fn void QGeoMapRouteObject::detailLevelChanged(quint32 detailLevel)
 
-    This signal is emitted when the level of detail used to draw this 
+    This signal is emitted when the level of detail used to draw this
     route object has changed.
 
     The new value is \a detailLevel.
diff --git a/src/location/maps/qgeomaptextobject.cpp b/src/location/maps/qgeomaptextobject.cpp
index 0c451f451a..8cc8d1ab08 100644
--- a/src/location/maps/qgeomaptextobject.cpp
+++ b/src/location/maps/qgeomaptextobject.cpp
@@ -50,6 +50,7 @@ QTM_BEGIN_NAMESPACE
     text on a map.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-mapping-objects
 
@@ -72,7 +73,7 @@ QGeoMapTextObject::QGeoMapTextObject()
     Constructs a new text object which will display the text \a text with font
     \a font at the coordinate \a coordinate on the map.
 
-    The text will be displayed at an on-screen offset from the coordinate of \a 
+    The text will be displayed at an on-screen offset from the coordinate of \a
     offset pixels, and will be aligned according to \a alignment.
 */
 QGeoMapTextObject::QGeoMapTextObject(const QGeoCoordinate &coordinate,
@@ -297,7 +298,7 @@ void QGeoMapTextObject::setAlignment(Qt::Alignment alignment)
 /*!
 \fn void QGeoMapTextObject::coordinateChanged(const QGeoCoordinate &coordinate)
 
-    This signal is emitted when the coordinate at which this text 
+    This signal is emitted when the coordinate at which this text
     object will be drawn has changed.
 
     The new value is \a coordinate.
@@ -306,7 +307,7 @@ void QGeoMapTextObject::setAlignment(Qt::Alignment alignment)
 /*!
 \fn void QGeoMapTextObject::textChanged(const QString &text)
 
-    This signal is emitted when the text to be drawn by this text object 
+    This signal is emitted when the text to be drawn by this text object
     has changed.
 
     The new value is \a text.
@@ -315,7 +316,7 @@ void QGeoMapTextObject::setAlignment(Qt::Alignment alignment)
 /*!
 \fn void QGeoMapTextObject::fontChanged(const QFont &font)
 
-    This signal is emitted when the font use to draw this text object 
+    This signal is emitted when the font use to draw this text object
     has changed.
 
     The new value is \a font.
@@ -324,7 +325,7 @@ void QGeoMapTextObject::setAlignment(Qt::Alignment alignment)
 /*!
 \fn void QGeoMapTextObject::penChanged(const QPen &pen)
 
-    This signal is emitted when the pen used to draw the outline of the 
+    This signal is emitted when the pen used to draw the outline of the
     letters for this text object has changed.
 
     The new value is \a pen.
@@ -342,7 +343,7 @@ void QGeoMapTextObject::setAlignment(Qt::Alignment alignment)
 /*!
 \fn void QGeoMapTextObject::offsetChanged(const QPoint &offset)
 
-    This signal is emitted when the on screen offset from the coordinate at 
+    This signal is emitted when the on screen offset from the coordinate at
     which this text object will be drawn has changed.
 
     The new value is \a offset.
diff --git a/src/location/maps/qgeoroute.cpp b/src/location/maps/qgeoroute.cpp
index ecb3dcbaa9..564bef3fe3 100644
--- a/src/location/maps/qgeoroute.cpp
+++ b/src/location/maps/qgeoroute.cpp
@@ -54,6 +54,7 @@ QTM_BEGIN_NAMESPACE
     \brief The QGeoRoute class represents a route between two points.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-routing
 
diff --git a/src/location/maps/qgeoroutereply.cpp b/src/location/maps/qgeoroutereply.cpp
index 35b3dc49c6..22966b9022 100644
--- a/src/location/maps/qgeoroutereply.cpp
+++ b/src/location/maps/qgeoroutereply.cpp
@@ -51,6 +51,7 @@ QTM_BEGIN_NAMESPACE
     of QGeoRoutingManager.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-routing
 
diff --git a/src/location/maps/qgeorouterequest.cpp b/src/location/maps/qgeorouterequest.cpp
index 47897f6968..d4a41ac013 100644
--- a/src/location/maps/qgeorouterequest.cpp
+++ b/src/location/maps/qgeorouterequest.cpp
@@ -53,6 +53,7 @@ QTM_BEGIN_NAMESPACE
     which define a request for routing information.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-routing
 
@@ -124,8 +125,8 @@ QTM_BEGIN_NAMESPACE
     not be part of the route.
 
     \value NoFeature
-        Used by QGeoRoutingManager::supportedFeatureTypes() to indicate that 
-        no features will be taken into account when planning the route.    
+        Used by QGeoRoutingManager::supportedFeatureTypes() to indicate that
+        no features will be taken into account when planning the route.
     \value TollFeature
         Consdier tollways when planning the route.
     \value HighwayFeature
diff --git a/src/location/maps/qgeoroutesegment.cpp b/src/location/maps/qgeoroutesegment.cpp
index 1ee2406fdd..d86e8dfe52 100644
--- a/src/location/maps/qgeoroutesegment.cpp
+++ b/src/location/maps/qgeoroutesegment.cpp
@@ -52,6 +52,7 @@ QTM_BEGIN_NAMESPACE
     \brief The QGeoRouteSegment class represents a segment of a route.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-routing
 
@@ -230,7 +231,7 @@ void QGeoRouteSegment::setManeuver(const QGeoManeuver &maneuver)
 /*!
     Returns the manevuer for this route segment.
 
-    Will return an invalid QGeoManeuver if no information has been attached 
+    Will return an invalid QGeoManeuver if no information has been attached
     to the endpoint of this route segment.
 */
 QGeoManeuver QGeoRouteSegment::maneuver() const
diff --git a/src/location/maps/qgeoroutingmanager.cpp b/src/location/maps/qgeoroutingmanager.cpp
index 313aa95627..539369d76e 100644
--- a/src/location/maps/qgeoroutingmanager.cpp
+++ b/src/location/maps/qgeoroutingmanager.cpp
@@ -55,6 +55,7 @@ QTM_BEGIN_NAMESPACE
 
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-routing
 
diff --git a/src/location/maps/qgeoroutingmanagerengine.cpp b/src/location/maps/qgeoroutingmanagerengine.cpp
index abf3583614..cdcb0defdc 100644
--- a/src/location/maps/qgeoroutingmanagerengine.cpp
+++ b/src/location/maps/qgeoroutingmanagerengine.cpp
@@ -53,6 +53,7 @@ QTM_BEGIN_NAMESPACE
 
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-impl
 
diff --git a/src/location/maps/qgeosearchmanager.cpp b/src/location/maps/qgeosearchmanager.cpp
index 59d3d13f19..57ebf891dc 100644
--- a/src/location/maps/qgeosearchmanager.cpp
+++ b/src/location/maps/qgeosearchmanager.cpp
@@ -66,6 +66,7 @@ QTM_BEGIN_NAMESPACE
 
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-places
 
diff --git a/src/location/maps/qgeosearchmanagerengine.cpp b/src/location/maps/qgeosearchmanagerengine.cpp
index 355358e924..1c4510ed18 100644
--- a/src/location/maps/qgeosearchmanagerengine.cpp
+++ b/src/location/maps/qgeosearchmanagerengine.cpp
@@ -56,6 +56,7 @@ QTM_BEGIN_NAMESPACE
     to provide support for searching operations related to geographic data.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-impl
 
diff --git a/src/location/maps/qgeosearchreply.cpp b/src/location/maps/qgeosearchreply.cpp
index ce190287a1..6e4c3cc82a 100644
--- a/src/location/maps/qgeosearchreply.cpp
+++ b/src/location/maps/qgeosearchreply.cpp
@@ -51,6 +51,7 @@ QTM_BEGIN_NAMESPACE
 
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-places
 
@@ -260,7 +261,7 @@ int QGeoSearchReply::limit() const
 }
 
 /*!
-    Returns the offset into the entire result set at which to start 
+    Returns the offset into the entire result set at which to start
     fetching results.
 */
 int QGeoSearchReply::offset() const
@@ -279,7 +280,7 @@ void QGeoSearchReply::setLimit(int limit)
 }
 
 /*!
-    Sets the offset in the entire result set at which to start 
+    Sets the offset in the entire result set at which to start
     fetching result to \a offset.
 */
 void QGeoSearchReply::setOffset(int offset)
diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp
index 964c343d45..093540c7dd 100644
--- a/src/location/maps/qgeoserviceprovider.cpp
+++ b/src/location/maps/qgeoserviceprovider.cpp
@@ -72,6 +72,7 @@ QTM_BEGIN_NAMESPACE
     geographical information.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps
 
diff --git a/src/location/maps/qgeoserviceproviderfactory.cpp b/src/location/maps/qgeoserviceproviderfactory.cpp
index 643faf80d0..600c4469b5 100644
--- a/src/location/maps/qgeoserviceproviderfactory.cpp
+++ b/src/location/maps/qgeoserviceproviderfactory.cpp
@@ -51,6 +51,7 @@ QTM_BEGIN_NAMESPACE
 
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-impl
 
diff --git a/src/location/maps/qgraphicsgeomap.cpp b/src/location/maps/qgraphicsgeomap.cpp
index 39487216c4..f7fb49eed8 100644
--- a/src/location/maps/qgraphicsgeomap.cpp
+++ b/src/location/maps/qgraphicsgeomap.cpp
@@ -66,6 +66,7 @@ QTM_BEGIN_NAMESPACE
     interactions between the user and the map.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps-mapping
 
@@ -783,7 +784,7 @@ QGeoCoordinate QGraphicsGeoMap::screenPositionToCoordinate(QPointF screenPositio
 /*!
 \fn void QGraphicsGeoMap::connectivityModeChanged(QGraphicsGeoMap::ConnectivityMode connectivityMode)
 
-    This signal is emitted when the connectivity mode used to fetch the 
+    This signal is emitted when the connectivity mode used to fetch the
     map data changes.
 
     The new value is \a connectivityMode.
diff --git a/src/location/maps/tiled/qgeotiledmapdata.cpp b/src/location/maps/tiled/qgeotiledmapdata.cpp
index 3298e4d912..bbae6c7119 100644
--- a/src/location/maps/tiled/qgeotiledmapdata.cpp
+++ b/src/location/maps/tiled/qgeotiledmapdata.cpp
@@ -100,6 +100,8 @@ QTM_BEGIN_NAMESPACE
 
     \ingroup maps-impl-tiled
 
+    \since 1.2
+
     This class assumes that at a zoom level of z the world is represented as a
     2^z by 2^z grid of tiles, and that the Mercator projection is used to map
     back and forth between coordinate and positions on the map.
@@ -116,7 +118,7 @@ QTM_BEGIN_NAMESPACE
     worldReferenceViewportRect().
 
     NOTE: QGeoTiledMapData blocks property change signals from QGeoMapData by calling
-    QGeoMapData::setBlockPropertyChangeSignals() with true. Changing this in 
+    QGeoMapData::setBlockPropertyChangeSignals() with true. Changing this in
     QGeoTiledMapData subclasses will cause the signals being emitted at wrong time.
 */
 
diff --git a/src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp b/src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp
index 9278c48776..21705d1775 100644
--- a/src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp
+++ b/src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp
@@ -54,6 +54,8 @@ QTM_BEGIN_NAMESPACE
 
     \ingroup maps-impl-tiled
 
+    \since 1.2
+
     Subclasses of QGeoTiledMappingManagerEngine need to provide an implementation
     of getTileImage().
 
diff --git a/src/location/maps/tiled/qgeotiledmapreply.cpp b/src/location/maps/tiled/qgeotiledmapreply.cpp
index 99f2213803..4a545f4ffb 100644
--- a/src/location/maps/tiled/qgeotiledmapreply.cpp
+++ b/src/location/maps/tiled/qgeotiledmapreply.cpp
@@ -57,6 +57,8 @@ QTM_BEGIN_NAMESPACE
 
     \ingroup maps-impl-tiled
 
+    \since 1.2
+
     Instances of QGeoTiledMapReply manage the state and results of these
     operations.
 
diff --git a/src/location/maps/tiled/qgeotiledmaprequest.cpp b/src/location/maps/tiled/qgeotiledmaprequest.cpp
index 9622c2b680..09c906a694 100644
--- a/src/location/maps/tiled/qgeotiledmaprequest.cpp
+++ b/src/location/maps/tiled/qgeotiledmaprequest.cpp
@@ -55,6 +55,8 @@ QTM_BEGIN_NAMESPACE
 
     \ingroup maps-impl-tiled
 
+    \since 1.2
+
     The tile is specified by a map type, a zoom level, a row and a column.
 
     At a zoom level of z the world is represented as a 2^z by 2^z grid
@@ -76,9 +78,9 @@ QGeoTiledMapRequest::QGeoTiledMapRequest()
 
     This tiled map request represents a request for the tile at row \a row and
     column \a column at zoom level \a zoomLevel and type
-    \a mapType. 
-    
-    The request will use connectivity mode \a connectivityMode when 
+    \a mapType.
+
+    The request will use connectivity mode \a connectivityMode when
     accessing the map data.
 
     The rectangle that the tile occupies on the map at the maximum zoom level
diff --git a/src/location/qgeoaddress.cpp b/src/location/qgeoaddress.cpp
index 7c6e85bcee..e01402d62b 100644
--- a/src/location/qgeoaddress.cpp
+++ b/src/location/qgeoaddress.cpp
@@ -76,6 +76,7 @@ QGeoAddressPrivate::~QGeoAddressPrivate()
     \brief The QGeoAddress class represents an address
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup location
 
diff --git a/src/location/qgeoareamonitor.cpp b/src/location/qgeoareamonitor.cpp
index c92ca88e84..6917bdd61c 100644
--- a/src/location/qgeoareamonitor.cpp
+++ b/src/location/qgeoareamonitor.cpp
@@ -51,7 +51,8 @@
     changes for a specified set of coordinates.
 
     \inmodule QtLocation
-    
+    \since 1.0
+
     \ingroup location
 
     A QGeoAreaMonitor emits signals when the current position is in
@@ -172,21 +173,23 @@ qreal QGeoAreaMonitor::radius() const
 
     Returns 0 if the system has no support for position monitoring.
 
-    Note: Symbian applications will need to have the Location capability 
+    Note: Symbian applications will need to have the Location capability
     otherwise this will return 0.
 */
 QGeoAreaMonitor *QGeoAreaMonitor::createDefaultMonitor(QObject *parent)
 {
-#if defined(Q_OS_SYMBIAN) && defined(QT_LOCATION_S60_MONITORING)
-    QGeoAreaMonitor *ret = NULL;
-    TRAPD(error, ret = QGeoAreaMonitorS60::NewL(parent));
-    return ret;
-#else
+    // Native Symbian area monitor is temporarily disabled,
+    // see http://bugreports.qt.nokia.com/browse/QTMOBILITY-1059
+//#if defined(Q_OS_SYMBIAN) && defined(QT_LOCATION_S60_MONITORING)
+//    QGeoAreaMonitor *ret = NULL;
+//    TRAPD(error, ret = QGeoAreaMonitorS60::NewL(parent));
+//    return ret;
+//#else
     QGeoAreaMonitorPolling *ret = NULL;
     ret = new QGeoAreaMonitorPolling(parent);
     if (ret && ret->isValid())
         return ret;
-#endif
+//#endif
     return 0;
 }
 
diff --git a/src/location/qgeoboundingarea.cpp b/src/location/qgeoboundingarea.cpp
index ed4736847b..1f256be676 100644
--- a/src/location/qgeoboundingarea.cpp
+++ b/src/location/qgeoboundingarea.cpp
@@ -48,14 +48,15 @@ QTM_BEGIN_NAMESPACE
     \brief The QGeoBoundingArea class defines a geographic area.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps
 
-    This class is the base class for classes which specify a geographic 
-    area.  
-    
+    This class is the base class for classes which specify a geographic
+    area.
+
     For the sake of consistency, subclasses should describe the specific
-    details of the associated areas in terms of QGeoCoordinate instances 
+    details of the associated areas in terms of QGeoCoordinate instances
     and distances in metres.
 */
 
@@ -85,8 +86,8 @@ Returns the type of this area.
 
 Returns whether this bounding area is valid.
 
-An area is considered to be invalid if some of the data that is required to 
-unambiguously describe the area has not been set or has been set to an 
+An area is considered to be invalid if some of the data that is required to
+unambiguously describe the area has not been set or has been set to an
 unsuitable value.
 */
 
@@ -101,7 +102,7 @@ An empty area is a region which has a geometrical area of 0.
 /*!
 \fn bool QGeoBoundingArea::contains(const QGeoCoordinate &coordinate) const
 
-Returns whether the coordinate \a coordinate is contained within this 
+Returns whether the coordinate \a coordinate is contained within this
 area.
 */
 
diff --git a/src/location/qgeoboundingbox.cpp b/src/location/qgeoboundingbox.cpp
index 32dc7889b5..7d170ca22b 100644
--- a/src/location/qgeoboundingbox.cpp
+++ b/src/location/qgeoboundingbox.cpp
@@ -54,7 +54,8 @@ QTM_BEGIN_NAMESPACE
     \brief The QGeoBoundingBox class defines a rectangular geographic area.
 
     \inmodule QtLocation
-    
+    \since 1.1
+
     \ingroup maps
 
     The rectangle is defined in terms of a QGeoCoordinate which specifies the
diff --git a/src/location/qgeoboundingcircle.cpp b/src/location/qgeoboundingcircle.cpp
index 5be6fc764c..943e87e119 100644
--- a/src/location/qgeoboundingcircle.cpp
+++ b/src/location/qgeoboundingcircle.cpp
@@ -54,6 +54,7 @@ QTM_BEGIN_NAMESPACE
     \brief The QGeoBoundingCircle class defines a circular geographic area.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup maps
 
diff --git a/src/location/qgeocoordinate.cpp b/src/location/qgeocoordinate.cpp
index 0439c8c3de..f67666371d 100644
--- a/src/location/qgeocoordinate.cpp
+++ b/src/location/qgeocoordinate.cpp
@@ -82,7 +82,8 @@ QGeoCoordinatePrivate::QGeoCoordinatePrivate() {
     \brief The QGeoCoordinate class defines a geographical position on the surface of the Earth.
 
     \inmodule QtLocation
-    
+    \since 1.0
+
     \ingroup location
 
     A QGeoCoordinate is defined by latitude, longitude, and optionally, altitude.
@@ -418,16 +419,16 @@ void QGeoCoordinatePrivate::atDistanceAndAzimuth(const QGeoCoordinate &coord,
 }
 
 /*!
-    Returns the coordinate that is reached by traveling \a distance metres 
+    Returns the coordinate that is reached by traveling \a distance metres
     from the current coordinate at \a azimuth (or bearing) along a great-circle.
     There is an assumption that the Earth is spherical for the purpose of this
     calculation.
-    
+
     The altitude will have \a distanceUp added to it.
 
     Returns an invalid coordinate if this coordinate is invalid.
 */
-QGeoCoordinate QGeoCoordinate::atDistanceAndAzimuth(qreal distance, qreal azimuth, qreal distanceUp) const 
+QGeoCoordinate QGeoCoordinate::atDistanceAndAzimuth(qreal distance, qreal azimuth, qreal distanceUp) const
 {
     if (!isValid())
         return QGeoCoordinate();
diff --git a/src/location/qgeoplace.cpp b/src/location/qgeoplace.cpp
index 58b5921ac2..0fa7675711 100644
--- a/src/location/qgeoplace.cpp
+++ b/src/location/qgeoplace.cpp
@@ -61,6 +61,7 @@ QTM_BEGIN_NAMESPACE
     \brief The QGeoPlace class represents basic information about a place.
 
     \inmodule QtLocation
+    \since 1.1
 
     \ingroup location
 
diff --git a/src/location/qgeopositioninfo.cpp b/src/location/qgeopositioninfo.cpp
index 8491f7eed0..3d8e278031 100644
--- a/src/location/qgeopositioninfo.cpp
+++ b/src/location/qgeopositioninfo.cpp
@@ -59,7 +59,8 @@ public:
     \brief The QGeoPositionInfo class contains information gathered on a global position, direction and velocity at a particular point in time.
 
     \inmodule QtLocation
-    
+    \since 1.0
+
     \ingroup location
 
     A QGeoPositionInfo contains, at a minimum, a geographical coordinate and
diff --git a/src/location/qgeopositioninfosource.cpp b/src/location/qgeopositioninfosource.cpp
index c47da3ac67..ea03a0d652 100644
--- a/src/location/qgeopositioninfosource.cpp
+++ b/src/location/qgeopositioninfosource.cpp
@@ -73,7 +73,8 @@ QTM_BEGIN_NAMESPACE
     \brief The QGeoPositionInfoSource class is an abstract base class for the distribution of positional updates.
 
     \inmodule QtLocation
-    
+    \since 1.0
+
     \ingroup location
 
     The static function QGeoPositionInfoSource::createDefaultSource() creates a default
@@ -362,7 +363,7 @@ QGeoPositionInfoSource::PositioningMethods QGeoPositionInfoSource::preferredPosi
     Returns 0 if the system has no default position source and no valid plugins
     could be found.
 
-    Note: Symbian applications will need to have the Location capability 
+    Note: Symbian applications will need to have the Location capability
     otherwise this will return 0.
 */
 
diff --git a/src/location/qgeopositioninfosource_s60.cpp b/src/location/qgeopositioninfosource_s60.cpp
index bc1e140fa2..e1a7d204e4 100644
--- a/src/location/qgeopositioninfosource_s60.cpp
+++ b/src/location/qgeopositioninfosource_s60.cpp
@@ -61,7 +61,7 @@ CQGeoPositionInfoSourceS60::CQGeoPositionInfoSourceS60(QObject* aParent) : QGeoP
         mSupportedMethods(PositioningMethod(0)),
         mCurrentMethod(PositioningMethod(0)),
         mListSize(0),
-        mMinUpdateInterval(0),
+        mMinUpdateInterval(100),
         mStartUpdates(FALSE),
         mRegularUpdateTimedOut(FALSE),
         mModuleFlags(0)
@@ -141,9 +141,10 @@ void CQGeoPositionInfoSourceS60::ConstructL()
 
         CleanupStack::PushL(mDevStatusUpdateAO);
 
-        if (mCurrentModuleId != TUid::Null())
+        if (mCurrentModuleId != TUid::Null()) {
             mRegUpdateAO = CQMLBackendAO::NewL(this, RegularUpdate, mCurrentModuleId);
-
+            mRegUpdateAO->setUpdateInterval(updateInterval());
+        }
         CleanupStack::Pop(2);
     }
 
@@ -902,7 +903,6 @@ void CQGeoPositionInfoSourceS60::setPreferredPositioningMethods(PositioningMetho
         mCurrentModuleId = mList[index].mUid ;
         lRegLocker.unlock();
 
-
         index = checkModule(mCurrentModuleId);
 
         if (index >= 0 && index < mListSize) {
@@ -912,15 +912,12 @@ void CQGeoPositionInfoSourceS60::setPreferredPositioningMethods(PositioningMetho
             lRegLocker_interval.unlock();
         }
 
+        int value = mRegUpdateAO->setUpdateInterval(updateInterval);
+        //as the positioning module has changed,
+        //possibility of the minimumupdateinterval being changed
+        if (value != updateInterval)
+            QGeoPositionInfoSource::setUpdateInterval(value);
 
-        if (updateInterval) {
-            int value = mRegUpdateAO->setUpdateInterval(updateInterval);
-            //as the poistioning module has changed
-            //possibility of the minimumupdateinterval being changed
-            if (value != updateInterval)
-                QGeoPositionInfoSource::setUpdateInterval(value);
-
-        }
     }
 
 }
diff --git a/src/location/qgeopositioninfosourcefactory.cpp b/src/location/qgeopositioninfosourcefactory.cpp
index 1b53ed4813..3feae1376c 100644
--- a/src/location/qgeopositioninfosourcefactory.cpp
+++ b/src/location/qgeopositioninfosourcefactory.cpp
@@ -52,6 +52,7 @@ QTM_BEGIN_NAMESPACE
   \inmodule QtLocation
 
   \ingroup location
+  \since 1.2
 
   Implementers must provide a unique combination of sourceName() and
   sourceVersion() per plugin.
diff --git a/src/location/qgeosatelliteinfo.cpp b/src/location/qgeosatelliteinfo.cpp
index 5ce6fd6e97..96dbac9de6 100644
--- a/src/location/qgeosatelliteinfo.cpp
+++ b/src/location/qgeosatelliteinfo.cpp
@@ -60,7 +60,8 @@ public:
     \brief The QGeoSatelliteInfo class contains basic information about a satellite.
 
     \inmodule QtLocation
-    
+    \since 1.0
+
     \ingroup location
 
     \sa QGeoSatelliteInfoSource
diff --git a/src/location/qgeosatelliteinfosource.cpp b/src/location/qgeosatelliteinfosource.cpp
index 507b5c3499..b68b2a63db 100644
--- a/src/location/qgeosatelliteinfosource.cpp
+++ b/src/location/qgeosatelliteinfosource.cpp
@@ -219,7 +219,8 @@ void QGeoSatelliteInfoSourcePrivate::loadStaticPlugins(QHash<QString, QGeoPositi
     \brief The QGeoSatelliteInfoSource class is an abstract base class for the distribution of satellite information updates.
 
     \inmodule QtLocation
-    
+    \since 1.0
+
     \ingroup location
 
     The static function QGeoSatelliteInfoSource::createDefaultSource() creates a default
@@ -254,8 +255,8 @@ QGeoSatelliteInfoSource::QGeoSatelliteInfoSource(QObject *parent)
 
     Returns 0 if the system has no default source and no valid plugins
     could be found.
-    
-    Note: Symbian applications will need to have the Location capability 
+
+    Note: Symbian applications will need to have the Location capability
     otherwise this will return 0.
 */
 QGeoSatelliteInfoSource *QGeoSatelliteInfoSource::createDefaultSource(QObject *parent)
diff --git a/src/location/qmlbackendao_s60.cpp b/src/location/qmlbackendao_s60.cpp
index 55093a5afb..8674f37e4f 100644
--- a/src/location/qmlbackendao_s60.cpp
+++ b/src/location/qmlbackendao_s60.cpp
@@ -430,7 +430,9 @@ int CQMLBackendAO::setUpdateInterval(int aMilliSec)
 
     // If msec is not 0 and is less than the value returned by minimumUpdateInterval(),
     // the interval will be set to the minimum interval.
-    if (aMilliSec != 0 && aMilliSec <= minimumUpdateInterval) {
+    // if (aMilliSec != 0 && aMilliSec <= minimumUpdateInterval) {
+    // workaround, not accepting zero as value, see QTMOBILITY-995
+    if (aMilliSec <= minimumUpdateInterval) {
         mUpdateInterval = minimumUpdateInterval;
     } else {
         mUpdateInterval = aMilliSec;
@@ -444,7 +446,6 @@ int CQMLBackendAO::setUpdateInterval(int aMilliSec)
     // will set Either zero, minimum or +ve value
     // seconds converted to TTimeIntervalMicroSeconds
     aPosOption.SetUpdateInterval(TTimeIntervalMicroSeconds(mUpdateInterval * 1000));
-
     // set the timeout to the smaller of 150% of interval or update interval + 10 seconds
     TInt64 mUpdateTimeout = (mUpdateInterval * 3) / 2;
     if (mUpdateTimeout > mUpdateInterval + 10000)
diff --git a/src/location/qnmeapositioninfosource.cpp b/src/location/qnmeapositioninfosource.cpp
index f088180677..19e86553aa 100644
--- a/src/location/qnmeapositioninfosource.cpp
+++ b/src/location/qnmeapositioninfosource.cpp
@@ -429,7 +429,8 @@ void QNmeaPositionInfoSourcePrivate::emitUpdated(const QGeoPositionInfo &update)
     \brief The QNmeaPositionInfoSource class provides positional information using a NMEA data source.
 
     \inmodule QtLocation
-    
+    \since 1.0
+
     \ingroup location
 
     NMEA is a commonly used protocol for the specification of one's global