summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2015-09-02 19:58:15 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2015-09-02 17:01:05 +0000
commit381e11d264cbb116d37ee83a4be2ed504bffb717 (patch)
treea8909b27a62c1f8406f9e84c1fd16d51f50d91e2
parent3e6308409dd679389e6231745e4d919d68d6487c (diff)
downloadqtserialport-381e11d264cbb116d37ee83a4be2ed504bffb717.tar.gz
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 <denis.shienkov@gmail.com>
-rw-r--r--src/serialport/qserialport_win.cpp2
-rw-r--r--src/serialport/qserialport_wince.cpp2
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")));