diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-05-18 14:41:52 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-05-18 13:19:33 +0000 |
commit | 2928c9d61f8dacaeb503bdefb0e3517741a16914 (patch) | |
tree | 84437353c3331a9d373155a1cb382cf183f1a0d6 | |
parent | 193ed20a9d6f4b65fdffd4d3c43d7824eb450089 (diff) |
Remove some Tech preview remnants from Bluetooth documentation
Change-Id: Ifcae07ef5e046f45848495f4d6af973cde713fdf
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
-rw-r--r-- | src/bluetooth/doc/src/bluetooth-index.qdoc | 2 | ||||
-rw-r--r-- | src/bluetooth/doc/src/bluetooth-le-overview.qdoc | 7 | ||||
-rw-r--r-- | src/bluetooth/qlowenergycharacteristic.cpp | 3 | ||||
-rw-r--r-- | src/bluetooth/qlowenergycontroller.cpp | 3 | ||||
-rw-r--r-- | src/bluetooth/qlowenergydescriptor.cpp | 3 | ||||
-rw-r--r-- | src/bluetooth/qlowenergyservice.cpp | 3 |
6 files changed, 2 insertions, 19 deletions
diff --git a/src/bluetooth/doc/src/bluetooth-index.qdoc b/src/bluetooth/doc/src/bluetooth-index.qdoc index f5e76ff0..df7306b4 100644 --- a/src/bluetooth/doc/src/bluetooth-index.qdoc +++ b/src/bluetooth/doc/src/bluetooth-index.qdoc @@ -66,7 +66,7 @@ import statement in your \c .qml file: \section2 Guides \list \li \l {Qt Bluetooth Overview}{Classic Bluetooth Overview} - \li \l {Bluetooth Low Energy Overview} (Tech Preview) + \li \l {Bluetooth Low Energy Overview} \endlist \section2 Reference diff --git a/src/bluetooth/doc/src/bluetooth-le-overview.qdoc b/src/bluetooth/doc/src/bluetooth-le-overview.qdoc index 8cba2f64..909beae2 100644 --- a/src/bluetooth/doc/src/bluetooth-le-overview.qdoc +++ b/src/bluetooth/doc/src/bluetooth-le-overview.qdoc @@ -34,11 +34,9 @@ Low Energy devices. \tableofcontents - \section1 Technology Preview - 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. + At the moment, Qt supports the Bluetooth Low Energy central role. For more details on this limitation see below. \section1 What Is Bluetooth Low Energy @@ -166,9 +164,6 @@ Low Energy devices. and writing data stored on the device. The example code below is taken from the \l {heartlistener}{Heart Listener} example. - \note As of Qt 5.4 the Qt Bluetooth Low Energy API is in tech preview mode and supports Linux - with BlueZ 4.101 & 5.x. The minimal Linux kernel version is 3.5. - \section2 Establishing a Connection To be able to read and write the characteristics of the Bluetooth Low Energy peripheral device, diff --git a/src/bluetooth/qlowenergycharacteristic.cpp b/src/bluetooth/qlowenergycharacteristic.cpp index f0b78243..aba4a66b 100644 --- a/src/bluetooth/qlowenergycharacteristic.cpp +++ b/src/bluetooth/qlowenergycharacteristic.cpp @@ -64,9 +64,6 @@ QT_BEGIN_NAMESPACE format or range information specifying how the characteristic's value is to be\ interpreted. - \note This class is provided by Qt 5.4 as part of a Bluetooth Low Energy Tech Preview. - Some API elements may change until the final release of the feature. - \sa QLowEnergyService, QLowEnergyDescriptor */ diff --git a/src/bluetooth/qlowenergycontroller.cpp b/src/bluetooth/qlowenergycontroller.cpp index ee8ff180..44b6a6da 100644 --- a/src/bluetooth/qlowenergycontroller.cpp +++ b/src/bluetooth/qlowenergycontroller.cpp @@ -93,9 +93,6 @@ QT_BEGIN_NAMESPACE connection becomes invalid as soon as the controller disconnects from the remote Bluetooth Low Energy device. - \note This class is provided by Qt 5.4 as part of a Bluetooth Low Energy Tech Preview. - Some API elements may change until the final release of the feature. - \sa QLowEnergyService, QLowEnergyCharacteristic, QLowEnergyDescriptor */ diff --git a/src/bluetooth/qlowenergydescriptor.cpp b/src/bluetooth/qlowenergydescriptor.cpp index 16b5b02b..cf1f46fa 100644 --- a/src/bluetooth/qlowenergydescriptor.cpp +++ b/src/bluetooth/qlowenergydescriptor.cpp @@ -57,9 +57,6 @@ QT_BEGIN_NAMESPACE The \l {QLowEnergyService::descriptorWritten()} signal is emitted upon success. The cahced \l value() of this object is updated accordingly. - \note This class is provided by Qt 5.4 as part of a Bluetooth Low Energy Tech Preview. - Some API elements may change until the final release of the feature. - \sa QLowEnergyService, QLowEnergyCharacteristic */ diff --git a/src/bluetooth/qlowenergyservice.cpp b/src/bluetooth/qlowenergyservice.cpp index f7a73326..0781def5 100644 --- a/src/bluetooth/qlowenergyservice.cpp +++ b/src/bluetooth/qlowenergyservice.cpp @@ -159,9 +159,6 @@ QT_BEGIN_NAMESPACE related \l QLowEnergyController disconnecting from the device are shared the same way. - \note This class is provided by Qt 5.4 as part of a Bluetooth Low Energy Tech Preview. - Some API elements may change until the final release of the feature. - \sa QLowEnergyController, QLowEnergyCharacteristic, QLowEnergyDescriptor */ |