1 files changed, 14 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm b/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
index 6a0247a6..bd9cc7f3 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
@@ -94,6 +94,8 @@ private:
     bool isDuplicatedService(const QBluetoothServiceInfo &serviceInfo) const;
     void serviceDiscoveryFinished();
 
+    bool serviceHasMathingUuid(const QBluetoothServiceInfo &serviceInfo) const;
+
     QBluetoothServiceDiscoveryAgent *q_ptr;
 
     QBluetoothServiceDiscoveryAgent::Error error;
@@ -369,7 +371,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::performMinimalServiceDiscovery(cons
             if (!serviceInfo.isValid())
                 continue;
 
-            if (!uuidFilter.isEmpty() && !uuidFilter.contains(serviceInfo.serviceUuid()))
+            if (!uuidFilter.isEmpty() && !serviceHasMathingUuid(serviceInfo))
                 continue;
 
             if (!isDuplicatedService(serviceInfo)) {
@@ -424,6 +426,17 @@ void QBluetoothServiceDiscoveryAgentPrivate::serviceDiscoveryFinished()
         startServiceDiscovery();
 }
 
+bool QBluetoothServiceDiscoveryAgentPrivate::serviceHasMathingUuid(const QBluetoothServiceInfo &serviceInfo) const
+{
+    for (const auto &requestedUuid : uuidFilter) {
+        if (serviceInfo.serviceUuid() == requestedUuid)
+            return true;
+        if (serviceInfo.serviceClassUuids().contains(requestedUuid))
+            return true;
+    }
+    return false;
+}
+
 QBluetoothServiceDiscoveryAgent::QBluetoothServiceDiscoveryAgent(QObject *parent)
 : QObject(parent),
   d_ptr(new QBluetoothServiceDiscoveryAgentPrivate(this, QBluetoothAddress()))