summaryrefslogtreecommitdiff
path: root/src/positioning
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2013-10-11 16:43:21 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-14 13:18:16 +0200
commit997e06d80c095ac994391bfb5d69c5ec9a52a11f (patch)
tree19d8d15e4bdc23ba647562dbd64c92333c07ce37 /src/positioning
parente200f05bc75d8f19df624bc3849d9c5bbf096873 (diff)
downloadqtlocation-997e06d80c095ac994391bfb5d69c5ec9a52a11f.tar.gz
Add proper version to QtPositioning and its QML API.
The QML API remains available under 5.0 though. Change-Id: I037b82e5b12825db610e8458d6c82122ecde4f44 Reviewed-by: Erik Mattsson <erik.mattsson@appello.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/positioning')
-rw-r--r--src/positioning/doc/snippets/doc_src_qtpositioning.qml2
-rw-r--r--src/positioning/doc/src/qtpositioning-qml.qdoc2
-rw-r--r--src/positioning/doc/src/qtpositioning.qdoc8
-rw-r--r--src/positioning/qdeclarativegeoaddress.cpp2
-rw-r--r--src/positioning/qdeclarativegeolocation.cpp2
-rw-r--r--src/positioning/qgeoaddress.cpp2
-rw-r--r--src/positioning/qgeoareamonitorsource.cpp2
-rw-r--r--src/positioning/qgeocircle.cpp2
-rw-r--r--src/positioning/qgeocoordinate.cpp2
-rw-r--r--src/positioning/qgeolocation.cpp2
-rw-r--r--src/positioning/qgeopositioninfo.cpp2
-rw-r--r--src/positioning/qgeopositioninfosource.cpp2
-rw-r--r--src/positioning/qgeopositioninfosourcefactory.cpp2
-rw-r--r--src/positioning/qgeorectangle.cpp2
-rw-r--r--src/positioning/qgeosatelliteinfo.cpp2
-rw-r--r--src/positioning/qgeosatelliteinfosource.cpp2
-rw-r--r--src/positioning/qgeoshape.cpp2
-rw-r--r--src/positioning/qnmeapositioninfosource.cpp2
18 files changed, 19 insertions, 23 deletions
diff --git a/src/positioning/doc/snippets/doc_src_qtpositioning.qml b/src/positioning/doc/snippets/doc_src_qtpositioning.qml
index cc9547b7..c1e910bc 100644
--- a/src/positioning/doc/snippets/doc_src_qtpositioning.qml
+++ b/src/positioning/doc/snippets/doc_src_qtpositioning.qml
@@ -39,7 +39,7 @@
****************************************************************************/
//! [import]
-import QtPositioning 5.0
+import QtPositioning 5.2
//! [import]
Item {
diff --git a/src/positioning/doc/src/qtpositioning-qml.qdoc b/src/positioning/doc/src/qtpositioning-qml.qdoc
index e9a57870..a5173662 100644
--- a/src/positioning/doc/src/qtpositioning-qml.qdoc
+++ b/src/positioning/doc/src/qtpositioning-qml.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \qmlmodule QtPositioning 5.0
+ \qmlmodule QtPositioning 5.2
\title Qt Positioning QML Types
\ingroup qmlmodules
\brief Provides QML types for position information
diff --git a/src/positioning/doc/src/qtpositioning.qdoc b/src/positioning/doc/src/qtpositioning.qdoc
index 449b2de5..ea353942 100644
--- a/src/positioning/doc/src/qtpositioning.qdoc
+++ b/src/positioning/doc/src/qtpositioning.qdoc
@@ -38,9 +38,7 @@
To load the Qt Positioning module, add the following statement to your .qml files
- \code
- import QtPositioning 5.0
- \endcode
+ \snippet doc_src_qtpositioning.qml import
For C++ projects include the header appropriate for the current use case,
for example applications using routes may use
@@ -78,9 +76,7 @@ can be performed.
To load the Qt Positioning module, add the following statement to your .qml files
-\code
- import QtPositioning 5.0
-\endcode
+\snippet doc_src_qtpositioning.qml import
For C++ projects include the header appropriate for the current use case,
for example applications using routes may use
diff --git a/src/positioning/qdeclarativegeoaddress.cpp b/src/positioning/qdeclarativegeoaddress.cpp
index 8d875383..6d14e48f 100644
--- a/src/positioning/qdeclarativegeoaddress.cpp
+++ b/src/positioning/qdeclarativegeoaddress.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
\qmltype Address
\instantiates QDeclarativeGeoAddress
\inqmlmodule QtPositioning
- \since Qt Positioning 5.0
+ \since 5.2
\brief The Address QML type represents a specific location as a street address.
diff --git a/src/positioning/qdeclarativegeolocation.cpp b/src/positioning/qdeclarativegeolocation.cpp
index 6f361065..fd1c0a39 100644
--- a/src/positioning/qdeclarativegeolocation.cpp
+++ b/src/positioning/qdeclarativegeolocation.cpp
@@ -47,7 +47,7 @@ QT_USE_NAMESPACE
\qmltype Location
\instantiates QDeclarativeGeoLocation
\inqmlmodule QtPositioning
- \since Qt Positioning 5.0
+ \since 5.2
\brief The Location type holds location data.
diff --git a/src/positioning/qgeoaddress.cpp b/src/positioning/qgeoaddress.cpp
index b62e3431..180d29dd 100644
--- a/src/positioning/qgeoaddress.cpp
+++ b/src/positioning/qgeoaddress.cpp
@@ -317,7 +317,7 @@ QGeoAddressPrivate::~QGeoAddressPrivate()
\ingroup QtPositioning-positioning
\ingroup QtLocation-places-data
\ingroup QtLocation-places
- \since Qt Positioning 5.0
+ \since 5.2
\brief The QGeoAddress class represents an address of a \l QGeoLocation.
diff --git a/src/positioning/qgeoareamonitorsource.cpp b/src/positioning/qgeoareamonitorsource.cpp
index 2f23d942..334d4a05 100644
--- a/src/positioning/qgeoareamonitorsource.cpp
+++ b/src/positioning/qgeoareamonitorsource.cpp
@@ -47,7 +47,7 @@
\class QGeoAreaMonitorSource
\inmodule QtPositioning
\ingroup QtPositioning-positioning
- \since Qt Positioning 5.0
+ \since 5.2
\brief The QGeoAreaMonitorSource class enables the detection of proximity
changes for a specified set of coordinates.
diff --git a/src/positioning/qgeocircle.cpp b/src/positioning/qgeocircle.cpp
index f9c43c1c..1228ce28 100644
--- a/src/positioning/qgeocircle.cpp
+++ b/src/positioning/qgeocircle.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
\class QGeoCircle
\inmodule QtPositioning
\ingroup QtPositioning-positioning
- \since Qt Positioning 5.0
+ \since 5.2
\brief The QGeoCircle class defines a circular geographic area.
diff --git a/src/positioning/qgeocoordinate.cpp b/src/positioning/qgeocoordinate.cpp
index e3392487..dc1a0e15 100644
--- a/src/positioning/qgeocoordinate.cpp
+++ b/src/positioning/qgeocoordinate.cpp
@@ -91,7 +91,7 @@ QGeoCoordinatePrivate::~QGeoCoordinatePrivate()
\class QGeoCoordinate
\inmodule QtPositioning
\ingroup QtPositioning-positioning
- \since Qt Positioning 5.0
+ \since 5.2
\brief The QGeoCoordinate class defines a geographical position on the surface of the Earth.
diff --git a/src/positioning/qgeolocation.cpp b/src/positioning/qgeolocation.cpp
index 2dc5a8b2..6c7ee1f0 100644
--- a/src/positioning/qgeolocation.cpp
+++ b/src/positioning/qgeolocation.cpp
@@ -83,7 +83,7 @@ bool QGeoLocationPrivate::isEmpty() const
\ingroup QtPositioning-positioning
\ingroup QtLocation-places
\ingroup QtLocation-places-data
- \since Qt Positioning 5.0
+ \since 5.2
\brief The QGeoLocation class represents basic information about a location.
diff --git a/src/positioning/qgeopositioninfo.cpp b/src/positioning/qgeopositioninfo.cpp
index 5c99ebc3..93fdc274 100644
--- a/src/positioning/qgeopositioninfo.cpp
+++ b/src/positioning/qgeopositioninfo.cpp
@@ -61,7 +61,7 @@ public:
\class QGeoPositionInfo
\inmodule QtPositioning
\ingroup QtPositioning-positioning
- \since Qt Positioning 5.0
+ \since 5.2
\brief The QGeoPositionInfo class contains information gathered on a global position, direction and velocity at a particular point in time.
diff --git a/src/positioning/qgeopositioninfosource.cpp b/src/positioning/qgeopositioninfosource.cpp
index b1617560..6556ed02 100644
--- a/src/positioning/qgeopositioninfosource.cpp
+++ b/src/positioning/qgeopositioninfosource.cpp
@@ -64,7 +64,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
\class QGeoPositionInfoSource
\inmodule QtPositioning
\ingroup QtPositioning-positioning
- \since Qt Positioning 5.0
+ \since 5.2
\brief The QGeoPositionInfoSource class is an abstract base class for the distribution of positional updates.
diff --git a/src/positioning/qgeopositioninfosourcefactory.cpp b/src/positioning/qgeopositioninfosourcefactory.cpp
index bebbe20e..0f5acf3f 100644
--- a/src/positioning/qgeopositioninfosourcefactory.cpp
+++ b/src/positioning/qgeopositioninfosourcefactory.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
/*!
\class QGeoPositionInfoSourceFactory
\inmodule QtPositioning
- \since Qt Positioning 5.0
+ \since 5.2
\brief The QGeoPositionInfoSourceFactory class is a factory class used
as the plugin interface for external providers of positioning data.
diff --git a/src/positioning/qgeorectangle.cpp b/src/positioning/qgeorectangle.cpp
index 354bdb1c..063ed9e3 100644
--- a/src/positioning/qgeorectangle.cpp
+++ b/src/positioning/qgeorectangle.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
\class QGeoRectangle
\inmodule QtPositioning
\ingroup QtPositioning-positioning
- \since Qt Positioning 5.0
+ \since 5.2
\brief The QGeoRectangle class defines a rectangular geographic area.
diff --git a/src/positioning/qgeosatelliteinfo.cpp b/src/positioning/qgeosatelliteinfo.cpp
index 1c19f295..16fe6feb 100644
--- a/src/positioning/qgeosatelliteinfo.cpp
+++ b/src/positioning/qgeosatelliteinfo.cpp
@@ -60,7 +60,7 @@ public:
\class QGeoSatelliteInfo
\inmodule QtPositioning
\ingroup QtPositioning-positioning
- \since Qt Positioning 5.0
+ \since 5.2
\brief The QGeoSatelliteInfo class contains basic information about a satellite.
diff --git a/src/positioning/qgeosatelliteinfosource.cpp b/src/positioning/qgeosatelliteinfosource.cpp
index ee1b316a..3cf35634 100644
--- a/src/positioning/qgeosatelliteinfosource.cpp
+++ b/src/positioning/qgeosatelliteinfosource.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
\class QGeoSatelliteInfoSource
\inmodule QtPositioning
\ingroup QtPositioning-positioning
- \since Qt Positioning 5.0
+ \since 5.2
\brief The QGeoSatelliteInfoSource class is an abstract base class for the distribution of satellite information updates.
diff --git a/src/positioning/qgeoshape.cpp b/src/positioning/qgeoshape.cpp
index 53799738..d48a67f2 100644
--- a/src/positioning/qgeoshape.cpp
+++ b/src/positioning/qgeoshape.cpp
@@ -72,7 +72,7 @@ bool QGeoShapePrivate::operator==(const QGeoShapePrivate &other) const
\class QGeoShape
\inmodule QtPositioning
\ingroup QtPositioning-positioning
- \since Qt Positioning 5.0
+ \since 5.2
\brief The QGeoShape class defines a geographic area.
diff --git a/src/positioning/qnmeapositioninfosource.cpp b/src/positioning/qnmeapositioninfosource.cpp
index 14b0f257..9ac928b2 100644
--- a/src/positioning/qnmeapositioninfosource.cpp
+++ b/src/positioning/qnmeapositioninfosource.cpp
@@ -429,7 +429,7 @@ void QNmeaPositionInfoSourcePrivate::emitUpdated(const QGeoPositionInfo &update)
\class QNmeaPositionInfoSource
\inmodule QtPositioning
\ingroup QtPositioning-positioning
- \since Qt Positioning 5.0
+ \since 5.2
\brief The QNmeaPositionInfoSource class provides positional information using a NMEA data source.