summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@qt.io>2018-09-18 12:03:53 +0200
committerAlex Blasche <alexander.blasche@qt.io>2018-09-18 10:40:26 +0000
commit09e582d1c1fb608e6b3cdbecf26a993386020782 (patch)
treea738b74ee141521f561fbebaad7a656428a35f2a
parent66829dd14377f61b54986f1870bc014daa71e268 (diff)
Fix various qdoc warnings in QtBluetooth
Change-Id: I49653a6ac6fa004987d32365f96a6407f50e207c Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
-rw-r--r--src/bluetooth/bluez/bluetoothmanagement.cpp2
-rw-r--r--src/bluetooth/qbluetoothdevicediscoveryagent.cpp6
-rw-r--r--src/bluetooth/qbluetoothdeviceinfo.cpp6
3 files changed, 7 insertions, 7 deletions
diff --git a/src/bluetooth/bluez/bluetoothmanagement.cpp b/src/bluetooth/bluez/bluetoothmanagement.cpp
index 3f97f75c..31d3dc02 100644
--- a/src/bluetooth/bluez/bluetoothmanagement.cpp
+++ b/src/bluetooth/bluez/bluetoothmanagement.cpp
@@ -135,7 +135,7 @@ static int sysCallCapGet(capHdr *header, capData *data)
return syscall(__NR_capget, header, data);
}
-/*!
+/*
* Checks that the current process has the effective CAP_NET_ADMIN permission.
*/
static bool hasBtMgmtPermission()
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp
index ac978349..cdb3d5d7 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp
@@ -158,12 +158,12 @@ Q_DECLARE_LOGGING_CATEGORY(QT_BT)
\fn void QBluetoothDeviceDiscoveryAgent::deviceUpdated(const QBluetoothDeviceInfo &info, QBluetoothDeviceInfo::Fields updatedFields)
This signal is emitted when the agent receives additional information about
- the Bluetooth device described by \a info. The \l updatedFields flags tell
+ the Bluetooth device described by \a info. The \a updatedFields flags tell
which information has been updated.
During discovery, some information can change dynamically, such as
- \l {signal strength}{QBluetoothDeviceInfo::rssi()} and
- \l {manufacturerData}{QBluetoothDeviceInfo::manufacturerData()}.
+ \l {QBluetoothDeviceInfo::rssi()}{signal strength} and
+ \l {QBluetoothDeviceInfo::manufacturerData()}{manufacturerData}.
This signal informs you that if your application is displaying this data, it
can be updated, rather than waiting until the discovery has finished.
diff --git a/src/bluetooth/qbluetoothdeviceinfo.cpp b/src/bluetooth/qbluetoothdeviceinfo.cpp
index bd3b9c00..bde8655e 100644
--- a/src/bluetooth/qbluetoothdeviceinfo.cpp
+++ b/src/bluetooth/qbluetoothdeviceinfo.cpp
@@ -74,8 +74,8 @@ QT_BEGIN_NAMESPACE
/*!
\enum QBluetoothDeviceInfo::Field
- This enum is used in conjuntion with the \l deviceUpdated() signal and indicates the field
- that changed.
+ This enum is used in conjuntion with the \l QBluetoothDeviceDiscoveryAgent::deviceUpdated() signal
+ and indicates the field that changed.
\value None None of the values changed.
\value RSSI The \l rssi() value of the device changed.
@@ -621,7 +621,7 @@ QByteArray QBluetoothDeviceInfo::manufacturerData(quint16 manufacturerId) const
Sets the advertised manufacturer \a data for the given \a manufacturerId.
Returns true if it was inserted or changed, false if it was already known.
- \sa manufacturerData,
+ \sa manufacturerData
\since 5.12
*/
bool QBluetoothDeviceInfo::setManufacturerData(quint16 manufacturerId, const QByteArray &data)