diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-01-07 13:56:58 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-01-07 13:27:42 +0000 |
| commit | 348e5f9dd947e53f5c8a0b9522a5af8652d27678 (patch) | |
| tree | a2b1a2bcf021d3ee7c8aae7c57ef26f76395281b | |
| parent | aea5e3971986b4beba395985108fcad2c0c98c37 (diff) | |
| download | qtconnectivity-348e5f9dd947e53f5c8a0b9522a5af8652d27678.tar.gz | |
Android: Fix QBluetoothSocket::bytesAvailable()
Task-number: QTBUG-50345
Change-Id: I721b98f9b6ccff2a987a6c477d08902332ce848c
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| -rw-r--r-- | src/bluetooth/android/inputstreamthread.cpp | 2 | ||||
| -rw-r--r-- | src/bluetooth/android/inputstreamthread_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/android/inputstreamthread.cpp b/src/bluetooth/android/inputstreamthread.cpp index c0e410b3..c1fb750a 100644 --- a/src/bluetooth/android/inputstreamthread.cpp +++ b/src/bluetooth/android/inputstreamthread.cpp @@ -65,7 +65,7 @@ bool InputStreamThread::run() return true; } -bool InputStreamThread::bytesAvailable() const +qint64 InputStreamThread::bytesAvailable() const { QMutexLocker locker(&m_mutex); return m_socket_p->buffer.size(); diff --git a/src/bluetooth/android/inputstreamthread_p.h b/src/bluetooth/android/inputstreamthread_p.h index 5897a524..1e518fdc 100644 --- a/src/bluetooth/android/inputstreamthread_p.h +++ b/src/bluetooth/android/inputstreamthread_p.h @@ -61,7 +61,7 @@ class InputStreamThread : public QObject public: explicit InputStreamThread(QBluetoothSocketPrivate *socket_p); - bool bytesAvailable() const; + qint64 bytesAvailable() const; bool run(); qint64 readData(char *data, qint64 maxSize); |