summaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorJean Gressmann <jean.gressmann@nokia.com>2012-03-26 18:24:38 +0200
committerQt by Nokia <qt-info@nokia.com>2012-03-26 18:11:02 +0200
commite03c6354d5bfe68108a3da7ad45fd9311b9f61a9 (patch)
treef9dbb128833987563f762c3e077be2221a63f596 /doc/src
parent07846bc812be2a454ad7b70f7677407e80305372 (diff)
downloadqtlocation-e03c6354d5bfe68108a3da7ad45fd9311b9f61a9.tar.gz
Positioning overview (C++) documentation has broken link
Moved log file example into its own page and updated NMEA section. Task-number: QTBUG-24440 Change-Id: Id7a608b7141b90213a6e8637154fd5e0f040d509 Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/position.qdoc50
1 files changed, 28 insertions, 22 deletions
diff --git a/doc/src/position.qdoc b/doc/src/position.qdoc
index 0a462a12..5f9e9016 100644
--- a/doc/src/position.qdoc
+++ b/doc/src/position.qdoc
@@ -143,7 +143,7 @@ cases, the default positioning methods should not be changed, as a source
may internally use a variety of positioning methods that can be useful to
the application.
-\section2 Reading NMEA Data
+\section2 NMEA Data
\l {http://en.wikipedia.org/wiki/NMEA_0183}{NMEA} is a common text-based
protocol for specifying navigational data. For convenience, the
@@ -154,18 +154,39 @@ from a NMEA log file). In simulation mode, the source will emit updates
according to the time stamp of each NMEA sentence to produce a "replay"
of the recorded data.
-
-\section2 Example: Creating a Custom Location Data Source
-
Generally, the capabilities provided by the default position source as
returned by QGeoPositionInfoSource::createDefaultSource(), along with the
QNmeaPositionInfoSource class, are sufficient for retrieving location
data. However, in some cases developers may wish to write their own custom
-location data sources.
+location data source.
The \c LogFilePositionSource class in \c examples/logfilepositionsource
-shows how to subclass QGeoPositionInfoSource to create a custom location
-data source.
+shows how to subclass QGeoPositionInfoSource to create a
+\l{location-positioning-custom-data-source-example-cpp.html}{custom location
+data source}.
+
+
+\section1 Examples
+
+\section3 \b{Flickr Example}
+
+The \l{Flickr QML}{Flickr Example} uses the Location to download thumbnail
+images from Flickr relevant to the current location.
+
+
+
+\section1 Location Position Classes
+
+\annotatedlist QtLocation-positioning
+
+*/
+
+
+/*!
+\page location-positioning-custom-data-source-example-cpp.html
+
+\title Creating a Custom Location Data Source
+\previouspage {location-positioning-cpp.html}{Positioning (C++)}
This example class reads location data from a text file, \e log.txt. The
file specifies location data using a simple text format: it contains one
@@ -222,19 +243,4 @@ that is received by \c ClientApplication.
Before running the example, make sure you have done both \tt make
and \tt {make install}.
-
-\section1 Examples
-
-\section3 \b{Flickr Example}
-
-The \l{Flickr QML}{Flickr Example} uses the Location to download thumbnail
-images from Flickr relevant to the current location.
-
-
-
-\section1 Location Position Classes
-
-\annotatedlist QtLocation-positioning
-
-
*/