summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-01-27 15:58:20 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-28 16:06:22 +0100
commit6d08ef8b9a56a35db8e21a5517a6304623129b83 (patch)
treef4bb8822ff29d2d6fbf9a286ee500a6e2e22653e /src
parenteae113bb1c9991cdb58b8566242d75ddb9c6677d (diff)
Add documentation for picture transfer example and minor QML fixes
Change-Id: I8ef9e19de9f48797034fd186dff4b0e096748b1d Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/bluetooth/doc/src/bluetooth-index.qdoc1
-rw-r--r--src/bluetooth/doc/src/examples.qdoc5
2 files changed, 5 insertions, 1 deletions
diff --git a/src/bluetooth/doc/src/bluetooth-index.qdoc b/src/bluetooth/doc/src/bluetooth-index.qdoc
index ff1651d0..77575994 100644
--- a/src/bluetooth/doc/src/bluetooth-index.qdoc
+++ b/src/bluetooth/doc/src/bluetooth-index.qdoc
@@ -68,6 +68,7 @@ import statement in your \c .qml file:
\li QML
\list
\li \l {scanner}{QML Bluetooth Scanner}
+ \li \l {picturetransfer}{QML Bluetooth Picture Push}
\endlist
\li C++
\list
diff --git a/src/bluetooth/doc/src/examples.qdoc b/src/bluetooth/doc/src/examples.qdoc
index 441b303d..a4329b3a 100644
--- a/src/bluetooth/doc/src/examples.qdoc
+++ b/src/bluetooth/doc/src/examples.qdoc
@@ -66,8 +66,11 @@
\li The tennis game using a QML interface to the Bluetooth API. It
must connect to an instance of the C++ \l{bttennis}{Bluetooth Tennis} game to play.
\row
- \li \l{btscanner}{QML Bluetooth Scanner}
+ \li \l{scanner}{QML Bluetooth Scanner}
\li A QML implementation of the Bluetooth device scanner.
+ \row
+ \li \l{picturetransfer}{QML Picture Push Example}
+ \li A QML application that transfers pictures between Bluetooth devices.
\endtable
*/