Merge branch '5.4' into 5.5

Change-Id: I177affc6c60fd3cc55e914a7ea2a9aeba260906f

1 files changed, 2 insertions, 12 deletions

diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp
index 47f5629e..c18ce279 100644
--- a/src/bluetooth/qbluetoothsocket_bluez.cpp
+++ b/src/bluetooth/qbluetoothsocket_bluez.cpp
@@ -511,20 +511,10 @@ qint64 QBluetoothSocketPrivate::readData(char *data, qint64 maxSize)
 
 void QBluetoothSocketPrivate::close()
 {
-    Q_Q(QBluetoothSocket);
-
-    // Only go through closing if the socket was fully opened
-    if(state == QBluetoothSocket::ConnectedState)
-        q->setSocketState(QBluetoothSocket::ClosingState);
-
-    if(txBuffer.size() > 0 &&
-       state == QBluetoothSocket::ClosingState){
+    if (txBuffer.size() > 0)
         connectWriteNotifier->setEnabled(true);
-    }
-    else {
+    else
         abort();
-    }
-
 }
 
 bool QBluetoothSocketPrivate::setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType_,