From a8c6d5e2dd2e1d0b51d6adf9e163b61b94366369 Mon Sep 17 00:00:00 2001 From: Mika Salmela Date: Mon, 28 Aug 2017 11:22:19 +0300 Subject: Check if the currentPortName is empty on blockingmaster example If there isn't serial ports available and the user still press the Start button, the example will crash. This patch adds the check if the currentPortName is empty and throws an error on that case. Change-Id: I7e85f398e2844064fb9b00cecfdf2afa271d7de0 Reviewed-by: Denis Shienkov --- examples/serialport/blockingmaster/masterthread.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/examples/serialport/blockingmaster/masterthread.cpp b/examples/serialport/blockingmaster/masterthread.cpp index c81c819..5ad93fd 100644 --- a/examples/serialport/blockingmaster/masterthread.cpp +++ b/examples/serialport/blockingmaster/masterthread.cpp @@ -107,6 +107,11 @@ void MasterThread::run() //! [5] //! [6] QSerialPort serial; + if (currentPortName.isEmpty()) { + emit error(tr("No port name specified")); + return; + } + while (!quit) { //![6] //! [7] if (currentPortNameChanged) { -- cgit v1.2.1 From 15d0472bde7a08b2f89b4361f3960486aca259bf Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Fri, 25 Aug 2017 09:26:09 +0300 Subject: Add changes file for Qt 5.6.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-62709 Change-Id: I217f27605d1f8b19069b21e5ff6f67c658506a2c Reviewed-by: André Hartmann Reviewed-by: Alex Blasche --- dist/changes-5.6.3 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 dist/changes-5.6.3 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. -- cgit v1.2.1 From 2a8284543018943ab581202cf934c751a22db6c7 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Thu, 7 Sep 2017 17:20:16 -0700 Subject: Exclude the QtSerialPort module from the VxWorks build It doesn't compile on that platform. Change-Id: I604d2b0d7c4b2c326b05e8e309b74164cb69d44c Reviewed-by: Gabriel de Dietrich --- qtserialport.pro | 1 + 1 file changed, 1 insertion(+) 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) -- cgit v1.2.1 From f9f02db5fc6ca4da97be63a67c469af49f97ab3b Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Thu, 21 Sep 2017 09:16:03 +0300 Subject: Add changes file for Qt 5.9.2 Task-number: QTBUG-62744 Change-Id: Id4d229e70babbfe2cf72298cb8b1f84f0c01e90b Reviewed-by: Denis Shienkov --- dist/changes-5.9.2 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 dist/changes-5.9.2 diff --git a/dist/changes-5.9.2 b/dist/changes-5.9.2 new file mode 100644 index 0000000..19a1526 --- /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. + +**************************************************************************** +* Library * +**************************************************************************** + +- This release contains only minor code improvements. -- cgit v1.2.1 From cb9ade8beabd3cdcd469a45fa82a27fcc960532f Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Fri, 22 Sep 2017 14:48:32 +0300 Subject: Fix content of changes file for v5.9.2 Change-Id: I484ad2e5bf366cdbffc01c97bbd45f4814fe9045 Reviewed-by: Denis Shienkov Reviewed-by: Edward Welbourne --- dist/changes-5.9.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/changes-5.9.2 b/dist/changes-5.9.2 index 19a1526..39fd0d9 100644 --- a/dist/changes-5.9.2 +++ b/dist/changes-5.9.2 @@ -18,7 +18,7 @@ Each of these identifiers can be entered in the bug tracker to obtain more information about a particular change. **************************************************************************** -* Library * +* Qt 5.9.2 Changes * **************************************************************************** - This release contains only minor code improvements. -- cgit v1.2.1 From 90081a1b3698375067a2177048df42a88f089dd9 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Thu, 28 Sep 2017 18:20:23 +0200 Subject: Update waitFor{ReadyRead|BytesWritten} documentation for timeouts [ChangeLog][QSerialPort] Added a note to the documentation that waitForReadyRead() and waitForBytesWritten() never time out if the parameter msecs is -1. Change-Id: I5852da14faf1bba5a338db6a8764da582238aae7 Reviewed-by: Denis Shienkov --- src/serialport/qserialport.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index 5534bb8..8ea5a48 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -1309,7 +1309,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 @@ -1341,7 +1341,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). -- cgit v1.2.1 From d3d1f826a8b29c302b85e9801c7b496902284570 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 6 Oct 2017 18:01:03 +0200 Subject: Bump version Change-Id: Ib999f791526f7648b567f0a2541fbc6ac68e3ad2 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 78a277a..2108ac6 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.9.2 +MODULE_VERSION = 5.9.3 -- cgit v1.2.1