diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-12-21 09:00:11 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-12-21 09:00:11 +0000 |
commit | 69b60f0f92c6d92e619d20caa98cdfb20766821d (patch) | |
tree | 6abf43902e37cb943e06fbb260513a3c022c9caf /src/bluetooth/qlowenergyservice.cpp | |
parent | ad87f48753d8e6721079240744b38b1c64ef22c9 (diff) | |
parent | 237ce0ec871c1850dab5f53e89df0296f62d90b5 (diff) |
Merge "Merge remote-tracking branch 'gerrit/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/bluetooth/qlowenergyservice.cpp')
-rw-r--r-- | src/bluetooth/qlowenergyservice.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bluetooth/qlowenergyservice.cpp b/src/bluetooth/qlowenergyservice.cpp index 9cccbc93..30a66db8 100644 --- a/src/bluetooth/qlowenergyservice.cpp +++ b/src/bluetooth/qlowenergyservice.cpp @@ -584,13 +584,13 @@ bool QLowEnergyService::contains(const QLowEnergyCharacteristic &characteristic) serialised. A queue is employed when issuing multiple requests at the same time. The queue does not eliminate duplicated read requests for the same characteristic. - A characteristic can only be read if the service is in the \l ServiceDiscovered state, - belongs to the service. If one of these conditions is + A characteristic can only be read if the service is in the \l ServiceDiscovered state + and belongs to the service. If one of these conditions is not true the \l QLowEnergyService::OperationError is set. \note Calling this function despite \l QLowEnergyCharacteristic::properties() reporting a non-readable property always attempts to read the characteristic's value on the hardware. If the hardware - returns with an error the \l CharacteristicWriteError is set. + returns with an error the \l CharacteristicReadError is set. \sa characteristicRead(), writeCharacteristic() @@ -630,7 +630,7 @@ void QLowEnergyService::readCharacteristic( \note Currently, it is not possible to use signed or reliable writes as defined by the Bluetooth specification. - A characteristic can only be written if this service is in the \l ServiceDiscovered state, + A characteristic can only be written if this service is in the \l ServiceDiscovered state and belongs to the service. If one of these conditions is not true the \l QLowEnergyService::OperationError is set. |