diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-16 21:52:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-16 21:52:03 +0100 |
| commit | eef68dea35960670c1a1a1431d4541e1ed19c781 (patch) | |
| tree | 097e6575b0cbc43704077d76372c986dcce3c998 /src/bluetooth/android/inputstreamthread.cpp | |
| parent | fa2389dd0a6df58d73d221654db36ff791b96e43 (diff) | |
| parent | c87458961f29064ab69a308526b0243debcdf1f7 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
src/bluetooth/qlowenergycontroller_bluez.cpp
Change-Id: I00f45a2a22a045e7836f2caeb76cc5599ced6279
Diffstat (limited to 'src/bluetooth/android/inputstreamthread.cpp')
| -rw-r--r-- | src/bluetooth/android/inputstreamthread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/android/inputstreamthread.cpp b/src/bluetooth/android/inputstreamthread.cpp index eef72230..ecd9218e 100644 --- a/src/bluetooth/android/inputstreamthread.cpp +++ b/src/bluetooth/android/inputstreamthread.cpp @@ -71,7 +71,7 @@ bool InputStreamThread::run() return true; } -bool InputStreamThread::bytesAvailable() const +qint64 InputStreamThread::bytesAvailable() const { QMutexLocker locker(&m_mutex); return m_socket_p->buffer.size(); |