diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-03-14 11:16:27 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-03-14 11:16:27 +0100 |
| commit | 83cd348bde8e856d2508c2514cd33a90e593461d (patch) | |
| tree | 9dbd933129ef4a9e514218fc6177d775aa94c9db /src/bluetooth/doc/src/bluetooth-index.qdoc | |
| parent | 4439541b05ae88a30159a5597d40f569328783ca (diff) | |
| parent | 40ac14e13b0aa07124c6ae9ef8eacfe6d8550684 (diff) | |
Merge branch 'dev' into btle
Conflicts:
src/bluetooth/qbluetoothuuid.cpp
tests/bttestui/btlocaldevice.cpp
Change-Id: Id16ab93ec61361950669da7eb232769c5dc4644f
Diffstat (limited to 'src/bluetooth/doc/src/bluetooth-index.qdoc')
| -rw-r--r-- | src/bluetooth/doc/src/bluetooth-index.qdoc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/bluetooth/doc/src/bluetooth-index.qdoc b/src/bluetooth/doc/src/bluetooth-index.qdoc index 32f6a787..e9575db1 100644 --- a/src/bluetooth/doc/src/bluetooth-index.qdoc +++ b/src/bluetooth/doc/src/bluetooth-index.qdoc @@ -32,10 +32,11 @@ Bluetooth is a short-range (less than 100 meters) wireless technology. It has a reasonably high data transfer rate of 2.1 Mbit/s, which makes it ideal -for transferring data between devices. +for transferring data between devices. Currently the API is supported on +Linux (Bluez 4.x), Android and BlackBerry 10. Bluetooth connectivity is based on basic device management, such as scanning -for devices, gathering information about them, and exchaning data between +for devices, gathering information about them, and exchanging data between them. \section1 Getting started @@ -43,7 +44,7 @@ them. To use the C++ library in your application, add the following configuration option to your \c .pro file: -\snippet doc_src_qtbluetooth.pro contacts project modification +\snippet snippets.pro contacts project modification To use the classes of the module in your application you need the following import statement in your \c .qml file: |