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/qlowenergycontroller_android.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/qlowenergycontroller_android.cpp')
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_android.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/qlowenergycontroller_android.cpp b/src/bluetooth/qlowenergycontroller_android.cpp index 767c91f8..fd4ea753 100644 --- a/src/bluetooth/qlowenergycontroller_android.cpp +++ b/src/bluetooth/qlowenergycontroller_android.cpp @@ -263,7 +263,7 @@ void QLowEnergyControllerPrivate::readCharacteristic( } if (!result) - service->setError(QLowEnergyService::CharacteristicWriteError); + service->setError(QLowEnergyService::CharacteristicReadError); } void QLowEnergyControllerPrivate::readDescriptor( @@ -289,7 +289,7 @@ void QLowEnergyControllerPrivate::readDescriptor( } if (!result) - service->setError(QLowEnergyService::DescriptorWriteError); + service->setError(QLowEnergyService::DescriptorReadError); } void QLowEnergyControllerPrivate::connectionUpdated( |