diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-20 11:39:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-27 13:00:40 +0100 |
| commit | 9d6057f3fa0b51ee2d36ad931072d2a3c816d0a6 (patch) | |
| tree | abd3b315377daadd57f2c5356c5512b1020fe349 /src/bluetooth/qbluetoothserver.cpp | |
| parent | ae1a2b8b0149b473190623910a98096c3f117328 (diff) | |
Android: Fix crash in QBluetoothServer::close()
Java's BluetoothSocketServer.accept() is meant to be interrupted
via BluetoothSocketServer.close(). Unfortunately if the surrounding
thread is a QThread the returning accept call crashes the thread. This
does not happen if it is a Java Thread.
This commit changes the server's private backend to a Java thread.
Task-number: QTBUG-36754
Change-Id: I5aacc5444bbcd1275a11743b6aa04d2b11a5b22b
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothserver.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothserver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothserver.cpp b/src/bluetooth/qbluetoothserver.cpp index a7ceff64..8665e33e 100644 --- a/src/bluetooth/qbluetoothserver.cpp +++ b/src/bluetooth/qbluetoothserver.cpp @@ -145,7 +145,7 @@ QT_BEGIN_NAMESPACE /*! \fn QBluetoothSocket *QBluetoothServer::nextPendingConnection() - Returns a pointer to aQBluetoothSocket for the next pending connection. It is the callers + Returns a pointer to the QBluetoothSocket for the next pending connection. It is the callers responsibility to delete the pointer. */ |