diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2014-07-17 11:24:29 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@digia.com> | 2014-07-17 11:24:29 +0200 |
commit | 091322bcd89e8a68ac4cd660055ffa5c270df276 (patch) | |
tree | af20f8232f81700f2934eccd2c98d2c78d5f8b33 /tests/bttestui/btlocaldevice.cpp | |
parent | b5709787c9d68108bb44f6032427db3796bbdbdd (diff) | |
parent | 0d7c0661a538896c94a3493d9c97fca07cc526d7 (diff) |
Merge branch '5.3' into dev
Conflicts:
src/bluetooth/bluez/bluez.pri
src/bluetooth/qbluetoothsocket_bluez.cpp
Change-Id: Ieca8f2a327bf54b42403ddab88f8b9c3ff6b4a95
Diffstat (limited to 'tests/bttestui/btlocaldevice.cpp')
-rw-r--r-- | tests/bttestui/btlocaldevice.cpp | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/tests/bttestui/btlocaldevice.cpp b/tests/bttestui/btlocaldevice.cpp index 92446fd0..3447de1a 100644 --- a/tests/bttestui/btlocaldevice.cpp +++ b/tests/bttestui/btlocaldevice.cpp @@ -266,6 +266,8 @@ void BtLocalDevice::stopDiscovery() void BtLocalDevice::startServiceDiscovery(bool isMinimalDiscovery) { if (serviceAgent) { + serviceAgent->setRemoteAddress(QBluetoothAddress()); + qDebug() << "###### Starting service discovery process"; serviceAgent->start(isMinimalDiscovery ? QBluetoothServiceDiscoveryAgent::MinimalDiscovery @@ -273,6 +275,24 @@ void BtLocalDevice::startServiceDiscovery(bool isMinimalDiscovery) } } +void BtLocalDevice::startTargettedServiceDiscovery() +{ + if (serviceAgent) { + const QBluetoothAddress baddr(BTCHAT_DEVICE_ADDR); + qDebug() << "###### Starting service discovery on" + << baddr.toString(); + if (baddr.isNull()) + return; + + if (!serviceAgent->setRemoteAddress(baddr)) { + qWarning() << "###### Cannot set remote address. Aborting"; + return; + } + + serviceAgent->start(); + } +} + void BtLocalDevice::stopServiceDiscovery() { if (serviceAgent) { @@ -401,6 +421,12 @@ void BtLocalDevice::abortSocket() qDebug() << "###### Disconnecting socket"; socket->abort(); } + + if (!serverSockets.isEmpty()) { + qDebug() << "###### Closing server sockets"; + foreach (QBluetoothSocket *s, serverSockets) + s->abort(); + } } void BtLocalDevice::socketConnected() |