diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:54:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:55:28 +0200 |
| commit | 4feae652c9c12ec4e5ef4c7bd575f8f316494add (patch) | |
| tree | 06571ec9b38fe312cba430092ab4a82ace5c6af1 /src/bluetooth/android/inputstreamthread.cpp | |
| parent | 7761bb88000c19d2f5bfb1182f5c5ddf7dae6c5a (diff) | |
| parent | b0089abb05e6f60cc252068be1ba40be32e29bd3 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I7a55929aefa1f7a4dc96f841317b78b248899f67
Diffstat (limited to 'src/bluetooth/android/inputstreamthread.cpp')
| -rw-r--r-- | src/bluetooth/android/inputstreamthread.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/bluetooth/android/inputstreamthread.cpp b/src/bluetooth/android/inputstreamthread.cpp index ecd9218e..982c477b 100644 --- a/src/bluetooth/android/inputstreamthread.cpp +++ b/src/bluetooth/android/inputstreamthread.cpp @@ -77,6 +77,12 @@ qint64 InputStreamThread::bytesAvailable() const return m_socket_p->buffer.size(); } +bool InputStreamThread::canReadLine() const +{ + QMutexLocker locker(&m_mutex); + return m_socket_p->buffer.canReadLine(); +} + qint64 InputStreamThread::readData(char *data, qint64 maxSize) { QMutexLocker locker(&m_mutex); |