summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-03-07 16:32:40 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-10 11:24:51 +0100
commit3300671a9c4e545d8c68f029300cbc53f4712388 (patch)
treedaf1b7f05d355bbb13eb8b39ad450d4877e929da /examples
parent76d5bc087cd80582af9b9a9c8b828bf9efb5cde5 (diff)
Update QtBluetooth docs for Qt 5.3
This fixes some spelling/grammar mistakes and updates information that has changed in Qt 5.3 Change-Id: I09d1ea1dc3edef08c3ee6a494968e13e91385c29 Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/bluetooth/btfiletransfer/doc/src/btfiletransfer.qdoc3
-rw-r--r--examples/bluetooth/bttennis/doc/src/bttennis.qdoc5
-rw-r--r--examples/bluetooth/picturetransfer/doc/src/picturetransfer.qdoc7
3 files changed, 10 insertions, 5 deletions
diff --git a/examples/bluetooth/btfiletransfer/doc/src/btfiletransfer.qdoc b/examples/bluetooth/btfiletransfer/doc/src/btfiletransfer.qdoc
index b97fb4b7..aeeffffb 100644
--- a/examples/bluetooth/btfiletransfer/doc/src/btfiletransfer.qdoc
+++ b/examples/bluetooth/btfiletransfer/doc/src/btfiletransfer.qdoc
@@ -30,7 +30,8 @@
\title Bluetooth File Transfer Example
The Bluetooth File Transfer example is an application to transfer files
- via a bluetooth connection.
+ via a bluetooth connection. This example does not work on Android due to
+ missing Object Push support.
\image btfiletransfer-example.png
diff --git a/examples/bluetooth/bttennis/doc/src/bttennis.qdoc b/examples/bluetooth/bttennis/doc/src/bttennis.qdoc
index 1f511199..136b181d 100644
--- a/examples/bluetooth/bttennis/doc/src/bttennis.qdoc
+++ b/examples/bluetooth/bttennis/doc/src/bttennis.qdoc
@@ -30,7 +30,10 @@
\title Bluetooth Tennis Example
The Bluetooth Tennis example shows how to use the Qt Connectivity Bluetooth API
- to implement real-time data transfer for interactive applications.
+ to implement real-time data transfer for interactive applications. The example
+ establishes a \l {QBluetoothServiceInfo::L2capProtocol}{L2CP} socket connection.
+ Since this protocol type is not supported on Android and BlackBerry the example
+ does not work on those platforms.
\image bttennis-example.png
diff --git a/examples/bluetooth/picturetransfer/doc/src/picturetransfer.qdoc b/examples/bluetooth/picturetransfer/doc/src/picturetransfer.qdoc
index fc2ffa32..7a166121 100644
--- a/examples/bluetooth/picturetransfer/doc/src/picturetransfer.qdoc
+++ b/examples/bluetooth/picturetransfer/doc/src/picturetransfer.qdoc
@@ -1,4 +1,4 @@
-/****************************************************************************
+a/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
@@ -30,7 +30,8 @@
\title QML Bluetooth Picture Push Example
The Bluetooth Picture Push example shows how to use the \l QBluetoothTransferManager
-API. The example transfers a local image to a remote device.
+API. The example transfers a local image to a remote device. Unfortunately this example cannot be used on
+Android as Qt does not support the Object Push Profile on this platform.
On the first user interface page the application scans for remote Bluetooth devices. The user must select
the appropriate device to continue:
@@ -38,7 +39,7 @@ the appropriate device to continue:
\image opp-example-1.png
The next page presents a list of image files on the device. The files must be located under
-\l QStandardPaths::PictureLocation}:
+\l QStandardPaths::PicturesLocation}:
\image opp-example-2.png