diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:45:47 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:31:09 +0100 |
commit | 77ba093c613217304782114b5f78fa9ad5512c38 (patch) | |
tree | 826666b1357354c5d96fa335d8aaeec84cc5ef39 /src | |
parent | 3e0d23ff3533fd11e0f5b680e1943e457468310c (diff) | |
parent | dd9fdb2ba4548f70eeceec2cfd2cd1ccdbbfc3d9 (diff) | |
download | qtserialport-77ba093c613217304782114b5f78fa9ad5512c38.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
examples/serialport/blockingmaster/masterthread.cpp
Change-Id: I3716089bae99247f98ed02656d4418de5f866c1d
Diffstat (limited to 'src')
-rw-r--r-- | src/serialport/qserialport.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index c4112a1..3b88736 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -1278,7 +1278,7 @@ bool QSerialPort::canReadLine() const This function blocks until new data is available for reading and the \l{QIODevice::}{readyRead()} signal has been emitted. The function will timeout after \a msecs milliseconds; the default timeout is - 30000 milliseconds. + 30000 milliseconds. If \a msecs is -1, this function will not time out. The function returns \c true if the readyRead() signal is emitted and there is new data available for reading; otherwise it returns \c false @@ -1310,7 +1310,7 @@ bool QSerialPort::waitForReadyRead(int msecs) This function blocks until at least one byte has been written to the serial port and the \l{QIODevice::}{bytesWritten()} signal has been emitted. The function will timeout after \a msecs milliseconds; the default timeout is - 30000 milliseconds. + 30000 milliseconds. If \a msecs is -1, this function will not time out. The function returns \c true if the bytesWritten() signal is emitted; otherwise it returns \c false (if an error occurred or the operation timed out). |