summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothsocket.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/bluetooth/qbluetoothsocket.cpp')
-rw-r--r--src/bluetooth/qbluetoothsocket.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp
index 4bd59095..36e4a54c 100644
--- a/src/bluetooth/qbluetoothsocket.cpp
+++ b/src/bluetooth/qbluetoothsocket.cpp
@@ -639,13 +639,6 @@ void QBluetoothSocket::abort()
setSocketState(ClosingState);
d->abort();
-
-#ifndef QT_ANDROID_BLUETOOTH
- //Android closes when the Java event loop comes around
- setSocketState(QBluetoothSocket::UnconnectedState);
- emit readChannelFinished();
- emit disconnected();
-#endif
}
void QBluetoothSocket::disconnectFromService()
@@ -725,14 +718,6 @@ void QBluetoothSocket::close()
setSocketState(ClosingState);
d->close();
-
-#ifndef QT_ANDROID_BLUETOOTH
- // TODO Add return type to d->close() & d->abort() to detect when to emit below signals
- //Android closes when the Java event loop comes around
- setSocketState(UnconnectedState);
- emit readChannelFinished();
- emit disconnected();
-#endif
}
/*!