diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-14 03:02:52 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-14 03:02:53 +0200 |
| commit | 6b9469b1a229486986f572af09459dacce5795de (patch) | |
| tree | f10983224aaaace5c502cbafad191e2e6f00d1ec /src/bluetooth | |
| parent | 16e37407cd6ad369d5250de1b9dac83083a45200 (diff) | |
| parent | 35a5cf01fb6ad16c039867d4f8ad3a3171fcc3a2 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I77de4f58db88f827b006d1e6501b3a1a836347bc
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; } } |