diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-09-23 13:52:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-25 10:37:27 +0200 |
| commit | 85de7d64e85aa058f1777bc9d1a778790b1d50a6 (patch) | |
| tree | a498afb7454905736cf589d3624ab68542ae04d8 /src/bluetooth/qbluetoothservicediscoveryagent.cpp | |
| parent | 85eac47703aa40df76e5102eb04291d8f029bfa3 (diff) | |
Fix peer to peer communication using two local adapters.
The code assumed to use the default adapter in a variety of places
which caused wrong SDP registrations, device searches and peer names.
The btchat examples was extended to cope with two local adapters. If there are
more than two local adapters they will be ignored.
Change-Id: I27d8bce65d943773e4e6cbd86982446fa79664a4
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.cpp b/src/bluetooth/qbluetoothservicediscoveryagent.cpp index 023ffb80..b613642c 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent.cpp @@ -329,7 +329,11 @@ void QBluetoothServiceDiscoveryAgentPrivate::startDeviceDiscovery() Q_Q(QBluetoothServiceDiscoveryAgent); if (!deviceDiscoveryAgent) { - deviceDiscoveryAgent = new QBluetoothDeviceDiscoveryAgent; +#ifdef QT_BLUEZ_BLUETOOTH + deviceDiscoveryAgent = new QBluetoothDeviceDiscoveryAgent(m_deviceAdapterAddress, q); +#else + deviceDiscoveryAgent = new QBluetoothDeviceDiscoveryAgent(q); +#endif QObject::connect(deviceDiscoveryAgent, SIGNAL(finished()), q, SLOT(_q_deviceDiscoveryFinished())); QObject::connect(deviceDiscoveryAgent, SIGNAL(deviceDiscovered(QBluetoothDeviceInfo)), |