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/qbluetoothdevicediscoveryagent.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/qbluetoothdevicediscoveryagent.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp index 6558a8f7..b6faee75 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp @@ -70,6 +70,8 @@ QT_BEGIN_NAMESPACE of devices. However not every platform can detect both types of devices. On platforms with this limitation (for example iOS only suports Low Energy discovery), the discovery process will limit the search to the type which is supported. + + \note Since Android 6.0 the ability to detect devices requires ACCESS_COARSE_LOCATION. */ /*! |