From 381e11d264cbb116d37ee83a4be2ed504bffb717 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Wed, 2 Sep 2015 19:58:15 +0300 Subject: Fix the typo for the ParityError detection on Windows Commit a2758cf594dd08a21037873f64f72166a353aa29 introduced a typo when the ParityError never will be detected. Change-Id: I2e4948fab52ae9b9de482b15ecb630f1648c9978 Reviewed-by: Denis Shienkov --- src/serialport/qserialport_win.cpp | 2 +- src/serialport/qserialport_wince.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index a9687a2..6c99491 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -608,7 +608,7 @@ void QSerialPortPrivate::handleLineStatusErrors() if (errors & CE_FRAME) { setError(QSerialPortErrorInfo(QSerialPort::FramingError, QSerialPort::tr("Framing error detected while reading"))); } else if (errors & CE_RXPARITY) { - setError(QSerialPortErrorInfo(QSerialPort::FramingError, QSerialPort::tr("ParityError error detected while reading"))); + setError(QSerialPortErrorInfo(QSerialPort::ParityError, QSerialPort::tr("ParityError error detected while reading"))); parityErrorOccurred = true; } else if (errors & CE_BREAK) { setError(QSerialPortErrorInfo(QSerialPort::BreakConditionError, QSerialPort::tr("Break condition detected while reading"))); diff --git a/src/serialport/qserialport_wince.cpp b/src/serialport/qserialport_wince.cpp index 88872ad..ac67e45 100644 --- a/src/serialport/qserialport_wince.cpp +++ b/src/serialport/qserialport_wince.cpp @@ -570,7 +570,7 @@ void QSerialPortPrivate::processIoErrors(bool hasError) if (errors & CE_FRAME) { setError(QSerialPortErrorInfo(QSerialPort::FramingError, QSerialPort::tr("Framing error detected while reading"))); } else if (errors & CE_RXPARITY) { - setError(QSerialPortErrorInfo(QSerialPort::FramingError, QSerialPort::tr("ParityError error detected while reading"))); + setError(QSerialPortErrorInfo(QSerialPort::ParityError, QSerialPort::tr("ParityError error detected while reading"))); parityErrorOccurred = true; } else if (errors & CE_BREAK) { setError(QSerialPortErrorInfo(QSerialPort::BreakConditionError, QSerialPort::tr("Break condition detected while reading"))); -- cgit v1.2.1 From ad108e9d56e7838eac3726e0492a246086d53e70 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Thu, 10 Sep 2015 13:29:41 +0300 Subject: Add changelog for Qt 5.5.1 Change-Id: I2712cb9157378805c7d4116c566f3188ec06bd66 Reviewed-by: Venugopal Shivashankar --- dist/changes-5.5.1 | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 dist/changes-5.5.1 diff --git a/dist/changes-5.5.1 b/dist/changes-5.5.1 new file mode 100644 index 0000000..8215a3f --- /dev/null +++ b/dist/changes-5.5.1 @@ -0,0 +1,41 @@ +Qt 5.5.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.5.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.5 series is binary compatible with the 5.4.x series. +Applications compiled for 5.4 will continue to run with 5.5. + +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 * +**************************************************************************** + + - Improved the Terminal example: + * The example has a permanent status message now. + + - QSerialPortInfo: + * [QTBUG-46875] Fixed crash while enumerating available ports + on OS X 10.10 + * [QTBUG-47127] Available serial port information is not duplicated + anymore on Windows. + * [QTBUG-47210] Now do not return devices which are not serial ports + on FreeBSD. + * Now returns the full information about the serial port on FreeBSD. + + - QSerialPort: + * Fixed the serial ports closing and data reading on WinCE. + * [QTBUG-45338] Fixed opening of the serial ports when using the + App Sandbox on OS X. + * [QTBUG-46993] Fixed opening of the serial ports on Windows, which + are provided by the "Exar VCP" driver. -- cgit v1.2.1