From 368726f6b36cfc3b5066e4051a2897904f8f7732 Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@theqtcompany.com>
Date: Thu, 13 Nov 2014 14:51:50 +0100
Subject: [PATCH] Add missing \since tags for new API introduced by Qt 5.4.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: Ie51d6e549d80baae57864d4e0d43a1c58897f149
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
---
src/bluetooth/qbluetooth.cpp | 1 +
src/bluetooth/qbluetoothtransferreply.cpp | 3 ++-
src/bluetooth/qbluetoothuuid.cpp | 7 ++++++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/bluetooth/qbluetooth.cpp b/src/bluetooth/qbluetooth.cpp
index d418adc1..ea3900e1 100644
--- a/src/bluetooth/qbluetooth.cpp
+++ b/src/bluetooth/qbluetooth.cpp
@@ -72,6 +72,7 @@ namespace QBluetooth {
/*!
\typedef QLowEnergyHandle
\relates QBluetooth
+ \since 5.4
Typedef for Bluetooth Low Energy ATT attribute handles.
*/
diff --git a/src/bluetooth/qbluetoothtransferreply.cpp b/src/bluetooth/qbluetoothtransferreply.cpp
index 6c5c83a2..af1bf828 100644
--- a/src/bluetooth/qbluetoothtransferreply.cpp
+++ b/src/bluetooth/qbluetoothtransferreply.cpp
@@ -64,7 +64,8 @@ QT_BEGIN_NAMESPACE
\value UserCanceledTransferError User terminated the transfer.
\value IODeviceNotReadableError File was not open before initiating the sending command.
\value ResourceBusyError Unable to access the resource..
- \value SessionError An error occurred during the handling of the session.
+ \value SessionError An error occurred during the handling of the session. This enum was
+ introduced by Qt 5.4.
*/
diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp
index 61798b03..1c8c0cf2 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.
@@ -425,6 +428,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],
@@ -435,6 +439,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],
--
GitLab