summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qlowenergydescriptor.cpp
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-06-30 09:39:35 +0200
committerAlex Blasche <alexander.blasche@digia.com>2014-07-02 16:17:14 +0200
commitce09187a209ec50aa8699e160dfc4f481a0d5e51 (patch)
treef5df3388a209680ff3ad1e9769638dd2c65efd4c /src/bluetooth/qlowenergydescriptor.cpp
parentc35020419edafae6e7d1f0489942909a611f729f (diff)
Rewrite Descriptor class unit test
- Rename test due to class renaming - Test all class properties - Fix QLowEnergyDescriptor::uuid() when using invalid descriptor - Fixup dead code in QLowEnergyController unit test Change-Id: I5ffed5b67db786e6c2d9752ca51d2ede51e3f176 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Diffstat (limited to 'src/bluetooth/qlowenergydescriptor.cpp')
-rw-r--r--src/bluetooth/qlowenergydescriptor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/qlowenergydescriptor.cpp b/src/bluetooth/qlowenergydescriptor.cpp
index 2a429a1a..c0dfdbb8 100644
--- a/src/bluetooth/qlowenergydescriptor.cpp
+++ b/src/bluetooth/qlowenergydescriptor.cpp
@@ -168,7 +168,7 @@ QBluetoothUuid QLowEnergyDescriptor::uuid() const
|| !d_ptr->characteristicList.contains(data->charHandle)
|| !d_ptr->characteristicList[data->charHandle].
descriptorList.contains(data->descHandle)) {
- return QBluetoothUuid::UnknownDescriptorType;
+ return QBluetoothUuid();
}
return d_ptr->characteristicList[data->charHandle].descriptorList[data->descHandle].uuid;