summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-10-30 07:45:47 (GMT)
committerLiang Qi <liang.qi@qt.io>2017-10-30 08:31:09 (GMT)
commit77ba093c613217304782114b5f78fa9ad5512c38 (patch)
tree826666b1357354c5d96fa335d8aaeec84cc5ef39
parent3e0d23ff3533fd11e0f5b680e1943e457468310c (diff)
parentdd9fdb2ba4548f70eeceec2cfd2cd1ccdbbfc3d9 (diff)
downloadqtserialport-77ba093c613217304782114b5f78fa9ad5512c38.tar.gz
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts: .qmake.conf examples/serialport/blockingmaster/masterthread.cpp Change-Id: I3716089bae99247f98ed02656d4418de5f866c1d
-rw-r--r--dist/changes-5.6.326
-rw-r--r--dist/changes-5.9.224
-rw-r--r--examples/serialport/blockingmaster/masterthread.cpp5
-rw-r--r--qtserialport.pro1
-rw-r--r--src/serialport/qserialport.cpp4
5 files changed, 58 insertions, 2 deletions
diff --git a/dist/changes-5.6.3 b/dist/changes-5.6.3
new file mode 100644
index 0000000..55c372d
--- /dev/null
+++ b/dist/changes-5.6.3
@@ -0,0 +1,26 @@
+Qt 5.6.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.6.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+ http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.6 series is binary compatible with the 5.5.x series.
+Applications compiled for 5.5 will continue to run with 5.6.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Library *
+****************************************************************************
+
+ - QSerialPort:
+ * [QTBUG-57783] Avoided writing an empty data buffer with the WriteFile
+ function on WEC2013.
diff --git a/dist/changes-5.9.2 b/dist/changes-5.9.2
new file mode 100644
index 0000000..39fd0d9
--- /dev/null
+++ b/dist/changes-5.9.2
@@ -0,0 +1,24 @@
+Qt 5.9.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Qt 5.9.2 Changes *
+****************************************************************************
+
+- This release contains only minor code improvements.
diff --git a/examples/serialport/blockingmaster/masterthread.cpp b/examples/serialport/blockingmaster/masterthread.cpp
index 12d23bb..25aa848 100644
--- a/examples/serialport/blockingmaster/masterthread.cpp
+++ b/examples/serialport/blockingmaster/masterthread.cpp
@@ -104,6 +104,11 @@ void MasterThread::run()
//! [5] //! [6]
QSerialPort serial;
+ if (currentPortName.isEmpty()) {
+ emit error(tr("No port name specified"));
+ return;
+ }
+
while (!m_quit) {
//![6] //! [7]
if (currentPortNameChanged) {
diff --git a/qtserialport.pro b/qtserialport.pro
index abdb21b..21fe427 100644
--- a/qtserialport.pro
+++ b/qtserialport.pro
@@ -4,6 +4,7 @@ lessThan(QT_MAJOR_VERSION, 5) {
}
requires(!integrity)
+requires(!vxworks)
requires(!winrt)
requires(!uikit)
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).