summaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2015-02-18 11:50:15 +0100
committerAlex Blasche <alexander.blasche@theqtcompany.com>2015-02-19 06:24:56 +0000
commitb45e1f6d8fe0a7c8a36f79ef51e02052a013ea2b (patch)
tree62ed863baa42db7c6af704f14e2b49a2af22c3c5 /doc/src
parentac936382edb5ee770ef9435c6ae20625bccf85ae (diff)
downloadqtdoc-b45e1f6d8fe0a7c8a36f79ef51e02052a013ea2b.tar.gz
Hook Qt Location into the general Qt documentation
Change-Id: I09f0fefa23cb93fd35e799f2bae3b9ecafa10597 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/mobile.qdoc11
-rw-r--r--doc/src/qtmodules.qdoc2
-rw-r--r--doc/src/whatsnew/whatsnew55.qdoc6
3 files changed, 19 insertions, 0 deletions
diff --git a/doc/src/mobile.qdoc b/doc/src/mobile.qdoc
index 04ba3646..726af223 100644
--- a/doc/src/mobile.qdoc
+++ b/doc/src/mobile.qdoc
@@ -65,6 +65,17 @@
\li \l{Qt Positioning}
\endlist
+ \section1 Location
+
+ The Qt Location module's API allows access to map, navigation, and place data.
+ It is possible to interact with tile maps using gestures to pan, flick, and
+ zoom. Additional information such as routes or places may be displayed on the
+ map.
+
+ \list
+ \li \l{Qt Location}
+ \endlist
+
\section1 Bluetooth
The Qt Bluetooth module's APIs allows access to Bluetooth-enabled devices.
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 6b1c8962..56ec6fc1 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -334,6 +334,8 @@
\li Module
\li Description
+ \row \li \l{Qt Location}
+ \li Displays map, navigation, and place content in a QML application.
\row \li \l{Qt WebView}
\li Displays web content in a QML application by using APIs native to the platform,
without the need to include a full web browser stack.
diff --git a/doc/src/whatsnew/whatsnew55.qdoc b/doc/src/whatsnew/whatsnew55.qdoc
index 82b9c8e4..702957d2 100644
--- a/doc/src/whatsnew/whatsnew55.qdoc
+++ b/doc/src/whatsnew/whatsnew55.qdoc
@@ -30,6 +30,12 @@
\title What's New in Qt 5.5
\brief Lists the new features in Qt 5.5.
+ \section1 New Modules
+
+ \list
+ \li \l[QtLocation]{Qt Location}
+ \endlist
+
\section1 New Features in Qt 5.5
\section2 Qt Bluetooth Module