diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-06 09:16:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-06 09:16:02 +0200 |
| commit | caded2edf69e8a60897653ace1e10b72199c7427 (patch) | |
| tree | 1b28cd7578195ca3d7e14c83ccf181adbe2476ec /src/bluetooth/qbluetoothlocaldevice.cpp | |
| parent | 9677182c07b22f5f1f4fdff3f1fce6a28f76b662 (diff) | |
| parent | 54c9cd9e28bc6f0a2fa5118cfdbe922d71db6623 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
examples/nfc/corkboard/corkboard.pro
Change-Id: I5d1ea0a8e21a1b55dbf744c2f4b469bc51f05c7a
Diffstat (limited to 'src/bluetooth/qbluetoothlocaldevice.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice.cpp b/src/bluetooth/qbluetoothlocaldevice.cpp index 85177cf3..b2e2adcf 100644 --- a/src/bluetooth/qbluetoothlocaldevice.cpp +++ b/src/bluetooth/qbluetoothlocaldevice.cpp @@ -175,6 +175,10 @@ bool QBluetoothLocalDevice::isValid() const \fn QBluetoothLocalDevice::address() const Returns the MAC address of this Bluetooth device. + + \note On Android, this function always returns the constant + value \c {02:00:00:00:00:00} as local address starting with Android 6.0. + The programmatic access to the device's local MAC address was removed. */ /*! |