diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:24:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:24:43 +0200 |
| commit | aabce3a08d1a65f8abc4872bd91a6dfd45cf7fd6 (patch) | |
| tree | 457dc8b600e0a4db7654708d921ef4ae398ae0d0 /src/bluetooth/qbluetoothdeviceinfo.cpp | |
| parent | b956fda0a1fa5813eb147e85ffc98e25d7177481 (diff) | |
| parent | 9dba73f30505ed7c220055788fba3cd201848fdb (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I3eec9a22565585d4fc40831d609a3083ce99a52c
Diffstat (limited to 'src/bluetooth/qbluetoothdeviceinfo.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothdeviceinfo.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothdeviceinfo.cpp b/src/bluetooth/qbluetoothdeviceinfo.cpp index 41f77153..f068963e 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.cpp +++ b/src/bluetooth/qbluetoothdeviceinfo.cpp @@ -316,7 +316,7 @@ QBluetoothDeviceInfo::QBluetoothDeviceInfo(const QBluetoothAddress &address, con Constructs a QBluetoothDeviceInfo object with unique \a uuid, device name \a name and the encoded class of device \a classOfDevice. - This constructor is required for Low Energy devices on OS X and iOS. CoreBluetooth + This constructor is required for Low Energy devices on \macos and iOS. CoreBluetooth API hides addresses and provides unique UUIDs to identify a device. This UUID is not the same thing as a service UUID and is required to work later with CoreBluetooth API and discovered devices. @@ -460,7 +460,7 @@ bool QBluetoothDeviceInfo::operator!=(const QBluetoothDeviceInfo &other) const /*! Returns the address of the device. - \note On iOS and OS X this address is invalid. Instead \l deviceUuid() should be used. + \note On iOS and \macos this address is invalid. Instead \l deviceUuid() should be used. Those two platforms do not expose Bluetooth addresses for found Bluetooth devices and utilize unique device identifiers. @@ -613,7 +613,7 @@ void QBluetoothDeviceInfo::setCached(bool cached) /*! Sets the unique identifier \a uuid for Bluetooth devices, that do not have addresses. - This happens on OS X and iOS, where the CoreBluetooth API hides addresses, but provides + This happens on \macos and iOS, where the CoreBluetooth API hides addresses, but provides UUIDs to identify devices/peripherals. This uuid is invalid on any other platform. @@ -631,7 +631,7 @@ void QBluetoothDeviceInfo::setDeviceUuid(const QBluetoothUuid &uuid) /*! Returns a unique identifier for a Bluetooth device without an address. - In general, this uuid is invalid on every platform but OS X and iOS. + In general, this uuid is invalid on every platform but \macos and iOS. It is used as a workaround for those two platforms as they do not provide Bluetooth addresses for found Bluetooth Low Energy devices. Every other platform uses \l address() instead. |