Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I0d7c92be8609cb7ec46b1895e1f270678ad681ae

2 files changed, 11 insertions, 0 deletions

diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp
index bbc32a90..25f07bb3 100644
--- a/src/bluetooth/qbluetoothsocket_bluez.cpp
+++ b/src/bluetooth/qbluetoothsocket_bluez.cpp
@@ -674,6 +674,9 @@ bool QBluetoothSocketPrivateBluez::setSocketDescriptor(int socketDescriptor, QBl
     connectWriteNotifier = nullptr;
 
     socketType = socketType_;
+    if (socket != -1)
+        QT_CLOSE(socket);
+
     socket = socketDescriptor;
 
     // ensure that O_NONBLOCK is set on new connections.
diff --git a/src/bluetooth/qlowenergycontroller_bluez.cpp b/src/bluetooth/qlowenergycontroller_bluez.cpp
index 65f4e0c2..dfa21004 100644
--- a/src/bluetooth/qlowenergycontroller_bluez.cpp
+++ b/src/bluetooth/qlowenergycontroller_bluez.cpp
@@ -3115,6 +3115,14 @@ void QLowEnergyControllerPrivateBluez::handleConnectionRequest()
     if (connectionHandle == 0)
         qCWarning(QT_BT_BLUEZ) << "Received client connection, but no connection complete event";
 
+    if (l2cpSocket) {
+        disconnect(l2cpSocket);
+        if (l2cpSocket->isOpen())
+            l2cpSocket->close();
+
+        l2cpSocket->deleteLater();
+        l2cpSocket = nullptr;
+    }
     closeServerSocket();
 
     QBluetoothSocketPrivateBluez *rawSocketPrivate = new QBluetoothSocketPrivateBluez();