diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:28:25 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:28:25 +0100 |
| commit | 3964a4a29d1237404bf554bb0b64d7de1d49155c (patch) | |
| tree | 927c389d624826e08a1e293ef3fa3d2d4dc39ee1 /src/bluetooth/qbluetoothuuid.cpp | |
| parent | 0e3046f29b0e86affeb33c8f6687618cfd1dfae2 (diff) | |
| parent | 73563f571e6dfd37a0e4cf90f4679d9901b9233c (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I6c1eabeea1b3397803e285d13cef147220ff5aa4
Diffstat (limited to 'src/bluetooth/qbluetoothuuid.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothuuid.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp index 3883b47b..f4840428 100644 --- a/src/bluetooth/qbluetoothuuid.cpp +++ b/src/bluetooth/qbluetoothuuid.cpp @@ -99,7 +99,8 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34 it can be used as a value for either of the above service attributes. Such a dual use has historical reasons but is no longer permissible for newer UUIDs. - The list below explicitly states as what type each UUID shall be used. + The list below explicitly states as what type each UUID shall be used. Bluetooth Low Energy related values + starting with 0x18 were introduced by Qt 5.4 \value ServiceDiscoveryServer Service discovery server UUID (service) \value BrowseGroupDescriptor Browser group descriptor (service) @@ -214,6 +215,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34 /*! \enum QBluetoothUuid::CharacteristicType + \since 5.4 This enum is a convienience type for Bluetooth low energy service characteristics class UUIDs. Values of this type will be implicitly converted into a QBluetoothUuid when necessary. @@ -369,6 +371,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34 /*! \enum QBluetoothUuid::DescriptorType + \since 5.4 Descriptors are attributes that describe Bluetooth Low Energy characteristic values. @@ -437,6 +440,7 @@ QBluetoothUuid::QBluetoothUuid(ServiceClassUuid uuid) /*! Constructs a new Bluetooth UUID from the characteristic type \a uuid. + \since 5.4 */ QBluetoothUuid::QBluetoothUuid(CharacteristicType uuid) : QUuid(uuid, baseUuid()->data2, baseUuid()->data3, baseUuid()->data4[0], baseUuid()->data4[1], @@ -447,6 +451,7 @@ QBluetoothUuid::QBluetoothUuid(CharacteristicType uuid) /*! Constructs a new Bluetooth UUID from the descriptor type \a uuid. + \since 5.4 */ QBluetoothUuid::QBluetoothUuid(DescriptorType uuid) : QUuid(uuid, baseUuid()->data2, baseUuid()->data3, baseUuid()->data4[0], baseUuid()->data4[1], |