diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-26 11:08:41 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-27 13:00:50 +0100 |
| commit | ccaeb6539d2f7e9ac756a7f2017c9f9e8813e265 (patch) | |
| tree | 496ce956fc9408ef3fb50d34d8a4c094f3de22b9 /src/bluetooth/qbluetoothsocket_p.h | |
| parent | 9d6057f3fa0b51ee2d36ad931072d2a3c816d0a6 (diff) | |
Fix crash when interrupting QBluetoothSocket's input stream thread
The previous QThread did not always properly resume when
InputStream.read() was interrupted by BluetoothSocket.close().
This patch converts the QThread to a Java thread which works
as the Android API docs suggested.
Task-number: QTBUG-37061
Change-Id: Id6ac9b57a28f3b532cbe49ff1dfdc9d1e6432aaa
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothsocket_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothsocket_p.h b/src/bluetooth/qbluetoothsocket_p.h index 2e1bb66f..2fabeba1 100644 --- a/src/bluetooth/qbluetoothsocket_p.h +++ b/src/bluetooth/qbluetoothsocket_p.h @@ -170,7 +170,7 @@ public: InputStreamThread *inputThread; private Q_SLOTS: - void inputThreadError(); + void inputThreadError(int errorCode); #endif |