From 5ec215a6cf1046846c0f5f0dd948502fdff45ff4 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 4 Sep 2014 12:25:22 +0200 Subject: Improve extended properties docs and fix qdoc error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This adds some valuable piece of information from the Bluetooth spec. Change-Id: Idb0211e23a3fc03674f7878eaebea9c529dbd69d Reviewed-by: Topi Reiniö --- src/bluetooth/qbluetoothuuid.cpp | 2 ++ src/bluetooth/qlowenergycharacteristic.cpp | 2 +- src/bluetooth/qlowenergycontroller.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp index 15d238e1..72bf3404 100644 --- a/src/bluetooth/qbluetoothuuid.cpp +++ b/src/bluetooth/qbluetoothuuid.cpp @@ -375,6 +375,8 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34 will be implicitly converted into a QBluetoothUuid when necessary. \value CharacteristicExtendedProperties Descriptor defines additional Characteristic Properties. + The existence of this descriptor is indicated by the + \l QLowEnergyCharacteristic::ExtendedProperty flag. \value CharacteristicUserDescription Descriptor provides a textual user description for a characteristic value. \value ClientCharacteristicConfiguration Descriptor defines how the characteristic may be configured by a specific client. \value ServerCharacteristicConfiguration Descriptor defines how the characteristic descriptor is associated with may be diff --git a/src/bluetooth/qlowenergycharacteristic.cpp b/src/bluetooth/qlowenergycharacteristic.cpp index 8d63419b..c3bd1a29 100644 --- a/src/bluetooth/qlowenergycharacteristic.cpp +++ b/src/bluetooth/qlowenergycharacteristic.cpp @@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE \value Notify Permits notification of characteristic values. \value Indicate Permits indications of characteristic values. \value WriteSigned Permits signed writes of the GATT characteristic values. - \value ExtendedProperty Additional characteristic properties are defined in the characteristic + \value ExtendedProperty Additional characteristic properties are defined in the characteristic's extended properties descriptor. \sa properties() diff --git a/src/bluetooth/qlowenergycontroller.cpp b/src/bluetooth/qlowenergycontroller.cpp index ce009f00..00c51adf 100644 --- a/src/bluetooth/qlowenergycontroller.cpp +++ b/src/bluetooth/qlowenergycontroller.cpp @@ -451,7 +451,7 @@ QLowEnergyController::ControllerState QLowEnergyController::state() const Returns the type of \l remoteAddress(). By default, this value is initialized to \l PublicAddress. - \sa setRemoteAddressType + \sa setRemoteAddressType() */ QLowEnergyController::RemoteAddressType QLowEnergyController::remoteAddressType() const { -- cgit v1.2.3