diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-11 03:00:38 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-11 03:00:38 +0200 |
| commit | 35a5cf01fb6ad16c039867d4f8ad3a3171fcc3a2 (patch) | |
| tree | c423c7d042a95545fabb1139ffc4b0847e8195d9 /src/bluetooth | |
| parent | b4c225c747d91122f7c145b337ad611c025c1ab6 (diff) | |
| parent | 14b0efe1d4e5addec5f577a2d01a3a0d9a1d931b (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ieb05b1eb0fa8247726f5f5de771496a9b50b9f55
Diffstat (limited to 'src/bluetooth')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.cpp b/src/bluetooth/qbluetoothservicediscoveryagent.cpp index da9c1386..9750b2aa 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent.cpp @@ -573,7 +573,8 @@ bool QBluetoothServiceDiscoveryAgentPrivate::isDuplicatedService( const QBluetoothServiceInfo &info = discoveredServices.at(j); if (info.device() == serviceInfo.device() && info.serviceClassUuids() == serviceInfo.serviceClassUuids() - && info.serviceUuid() == serviceInfo.serviceUuid()) { + && info.serviceUuid() == serviceInfo.serviceUuid() + && info.serverChannel() == serviceInfo.serverChannel()) { return true; } } |