Merge branch '5.3' into dev

Conflicts:
	src/bluetooth/bluez/bluez.pri
	src/bluetooth/qbluetoothsocket_bluez.cpp

Change-Id: Ieca8f2a327bf54b42403ddab88f8b9c3ff6b4a95

3 files changed, 32 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()
diff --git a/tests/bttestui/btlocaldevice.h b/tests/bttestui/btlocaldevice.h
index 759599b7..01d9b0df 100644
--- a/tests/bttestui/btlocaldevice.h
+++ b/tests/bttestui/btlocaldevice.h
@@ -87,6 +87,7 @@ public slots:
 
     //QBluetoothServiceDiscoveryAgent
     void startServiceDiscovery(bool isMinimalDiscovery);
+    void startTargettedServiceDiscovery();
     void stopServiceDiscovery();
     void serviceDiscovered(const QBluetoothServiceInfo &info);
     void serviceDiscoveryFinished();
diff --git a/tests/bttestui/main.qml b/tests/bttestui/main.qml
index d53aa4e1..93d943f2 100644
--- a/tests/bttestui/main.qml
+++ b/tests/bttestui/main.qml
@@ -168,6 +168,11 @@ Rectangle {
                 onClicked: device.startServiceDiscovery(false)
             }
             Button {
+                id: startRemoteSDiscBtn
+                buttonText: "StartRemSDisc"
+                onClicked: device.startTargettedServiceDiscovery()
+            }
+            Button {
                 buttonText: "StopSDisc"
                 onClicked: device.stopServiceDiscovery();
             }