diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2014-12-04 15:09:07 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2014-12-05 07:19:49 +0100 |
| commit | ffbb91da8e8f14d7d5ffa8bbeace3e6c42eb525b (patch) | |
| tree | 1a1f04e5221090606f9fb88e51f2b7c1463c2a94 /src | |
| parent | d21201f0536230848e419b71bdd2d025b3ae1468 (diff) | |
Update supported platforms and feature in QtBluetooth
The Low Energy API is final from Qt 5.5 onwards and OSX and iOS are
platform additions.
Change-Id: I73f18b3169c5e1438af4d90c6655eabb515e0d39
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/bluetooth/doc/src/bluetooth-index.qdoc | 12 | ||||
| -rw-r--r-- | src/bluetooth/doc/src/bluetooth-le-overview.qdoc | 13 |
2 files changed, 8 insertions, 17 deletions
diff --git a/src/bluetooth/doc/src/bluetooth-index.qdoc b/src/bluetooth/doc/src/bluetooth-index.qdoc index 112444a8..af2c2421 100644 --- a/src/bluetooth/doc/src/bluetooth-index.qdoc +++ b/src/bluetooth/doc/src/bluetooth-index.qdoc @@ -33,11 +33,9 @@ The Bluetooth API provides connectivity between Bluetooth enabled devices. -Currently the API is supported on \l{Qt for Android}{Android}, -\l{Qt for BlackBerry}{BlackBerry 10} and -\l{Qt for Linux/X11}{Linux} (\l{http://www.bluez.org}{BlueZ 4.x/5.x}). - - +Currently, the API is supported on the following platforms: \l{Qt for Android}{Android}, +\l{Qt for BlackBerry}{BlackBerry 10}, \l{Qt for iOS}{iOS}, \l{Qt for Linux/X11}{Linux} +(\l{http://www.bluez.org}{BlueZ 4.x/5.x}) and \l{Qt for OS X}{OS X}. \section1 Overview @@ -47,11 +45,9 @@ for transferring data between devices. Bluetooth connectivity is based on basic device management, such as scanning for devices, gathering information about them, and exchanging data between them. -This Qt release contains a Technology Preview of the new Qt Bluetooth +Qt 5.5 contains the first full release of the new Qt Bluetooth Low Energy API. Further details can be found in the \l {Bluetooth Low Energy Overview}{Bluetooth Low Energy Overview} section. -The Tech Preview supports BlueZ 4 & 5 based Linux systems. Support for -further platforms is being planned. \section1 Getting Started diff --git a/src/bluetooth/doc/src/bluetooth-le-overview.qdoc b/src/bluetooth/doc/src/bluetooth-le-overview.qdoc index 029171f4..a56e43fc 100644 --- a/src/bluetooth/doc/src/bluetooth-le-overview.qdoc +++ b/src/bluetooth/doc/src/bluetooth-le-overview.qdoc @@ -36,15 +36,10 @@ Low Energy devices. \section1 Technology Preview - The Qt Bluetooth Low Energy API has been introduced in Qt 5.4. - The API is considered to be a preview of the technology and currently only works - on BlueZ 4 & 5 based Linux systems. Support for further platforms, for example Android, - is currently being worked on and will be added by later Qt releases. In addition, - Qt only supports the central role. For more details on this limitation see below. - - While the API is not yet frozen it is close to its final stage. - We would like to encourage you to send us feedback and bug reports related to - this new feature. + The Qt Bluetooth Low Energy API was introduced by Qt 5.4. Since Qt 5.5 the API + is frozen and a compatibility guarantee is given for future releases. + At the moment, Qt only supports the Bluetooth Low Energy central role. + For more details on this limitation see below. \section1 What Is Bluetooth Low Energy |