diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:47:46 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:47:46 +0200 |
| commit | 81a8a8771f987ebfefbffc1a7a4003cbf0a1760d (patch) | |
| tree | c681a0112ef42a6a81bc9215d598b4a6838b3554 /src | |
| parent | caef6445a95dd1941fdf583f09407e1e32b11249 (diff) | |
| parent | 869547fc4fb4b94e97c81989cf85da85d588328b (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I0f261e312e052855a47a3985b62c40c2f0338119
Diffstat (limited to 'src')
| -rw-r--r-- | src/bluetooth/doc/src/bluetooth-le-overview.qdoc | 2 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothdeviceinfo.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/bluetooth/doc/src/bluetooth-le-overview.qdoc b/src/bluetooth/doc/src/bluetooth-le-overview.qdoc index 909beae2..70d9908a 100644 --- a/src/bluetooth/doc/src/bluetooth-le-overview.qdoc +++ b/src/bluetooth/doc/src/bluetooth-le-overview.qdoc @@ -35,7 +35,7 @@ Low Energy devices. \tableofcontents The Qt Bluetooth Low Energy API was introduced by Qt 5.4. Since Qt 5.5 the API - is frozen and a compatibility guarantee is given for future releases. + is final and a compatibility guarantee is given for future releases. At the moment, Qt supports the Bluetooth Low Energy central role. For more details on this limitation see below. diff --git a/src/bluetooth/qbluetoothdeviceinfo.cpp b/src/bluetooth/qbluetoothdeviceinfo.cpp index 37ba4e11..0a66c2c2 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.cpp +++ b/src/bluetooth/qbluetoothdeviceinfo.cpp @@ -614,6 +614,11 @@ 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. + 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. + \sa setDeviceUuid() \since 5.5 */ |