diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-05-26 14:56:49 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-05-26 14:56:49 +0200 |
| commit | f334ea4b196950c4074e7513626aabeef3d99d7f (patch) | |
| tree | ccb07d59afbb60a92b80a061645c8013aab9b96c /src/bluetooth/doc/src/bluetooth-overview.qdoc | |
| parent | 3910d9ffcc11db7b3beb7f2b6f0c1754103cfacb (diff) | |
| parent | 552f1a164d627720942414915fb56ae7d3b7ef22 (diff) | |
Merge branch 'dev' into btle
Conflicts:
examples/bluetooth/bluetooth.pro
src/bluetooth/bluez/bluez.pri
src/bluetooth/doc/src/bluetooth-index.qdoc
src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothdeviceinfo.cpp
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothservicediscoveryagent_p.h
src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Change-Id: I88b22c51a4ee95b067ef8d2b2fddb5cbff4566f8
Diffstat (limited to 'src/bluetooth/doc/src/bluetooth-overview.qdoc')
| -rw-r--r-- | src/bluetooth/doc/src/bluetooth-overview.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/doc/src/bluetooth-overview.qdoc b/src/bluetooth/doc/src/bluetooth-overview.qdoc index 8842f483..2a5d8de2 100644 --- a/src/bluetooth/doc/src/bluetooth-overview.qdoc +++ b/src/bluetooth/doc/src/bluetooth-overview.qdoc @@ -55,7 +55,7 @@ \section1 Retrieving Local Device Information The Qt Bluetooth API has three main purposes. The first one is to - obtain local and remote device information. The first steps in retrieving device information is + obtain local and remote device information. The first steps in retrieving device information are to check if Bluetooth is available on the device and read the local device address and name. QBluetoothLocalDevice is the class that provides all of this information. Additionally you can use it to turn Bluetooth on/off, set the visibility of the device and determine the current connections. @@ -69,7 +69,7 @@ your own and fill them with data, the easier way is to use the QBluetoothDeviceDiscoveryAgent to start an automated search for visible Bluetooth devices within the connectable range. - \snippet doc_src_qtbluetooth.cpp discovery + \snippet doc_src_qtbluetooth.cpp device_discovery \section1 Pushing Files to Remote Devices |