diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:37:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:37:33 +0200 |
| commit | 9e8daaed0466d760e047c5da58811e55e7807c0a (patch) | |
| tree | eb75deaa8be7b1bbd777416aa1995990cd0f86a1 /src/serialport/qserialport_p.h | |
| parent | 2ac9c0c0e6210f73884bbe2bcb3d8269519003a8 (diff) | |
| parent | 9c9255eda50af191636ff9f18df35567c307dd8c (diff) | |
| download | qtserialport-9e8daaed0466d760e047c5da58811e55e7807c0a.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I6a4c3e446633e6f142b87c268096b1bdc1598a62
Diffstat (limited to 'src/serialport/qserialport_p.h')
| -rw-r--r-- | src/serialport/qserialport_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/serialport/qserialport_p.h b/src/serialport/qserialport_p.h index ae2089d..cb300ad 100644 --- a/src/serialport/qserialport_p.h +++ b/src/serialport/qserialport_p.h @@ -188,6 +188,8 @@ public: bool getDcb(DCB *dcb); OVERLAPPED *waitForNotified(int msecs); + qint64 queuedBytesCount(QSerialPort::Direction direction) const; + bool completeAsyncCommunication(qint64 bytesTransferred); bool completeAsyncRead(qint64 bytesTransferred); bool completeAsyncWrite(qint64 bytesTransferred); |