Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	examples/nfc/corkboard/corkboard.pro

Change-Id: I5d1ea0a8e21a1b55dbf744c2f4b469bc51f05c7a

1 files changed, 6 insertions, 1 deletions

diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.cpp b/src/bluetooth/qbluetoothservicediscoveryagent.cpp
index a3df47de..fa1aba9d 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent.cpp
@@ -217,7 +217,9 @@ QList<QBluetoothServiceInfo> QBluetoothServiceDiscoveryAgent::discoveredServices
 }
 /*!
     Sets the UUID filter to \a uuids.  Only services matching the UUIDs in \a uuids will be
-    returned.
+    returned. The matching applies to the service's
+    \l {QBluetoothServiceInfo::ServiceId}{ServiceId} and \l {QBluetoothServiceInfo::ServiceClassIds} {ServiceClassIds}
+    attributes.
 
     An empty UUID list is equivalent to a list containing only QBluetoothUuid::PublicBrowseGroup.
 
@@ -234,6 +236,9 @@ void QBluetoothServiceDiscoveryAgent::setUuidFilter(const QList<QBluetoothUuid>
     This is an overloaded member function, provided for convenience.
 
     Sets the UUID filter to a list containing the single element \a uuid.
+    The matching applies to the service's \l {QBluetoothServiceInfo::ServiceId}{ServiceId}
+    and \l {QBluetoothServiceInfo::ServiceClassIds} {ServiceClassIds}
+    attributes.
 
     \sa uuidFilter()
 */