diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2015-09-02 19:58:15 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2015-09-02 18:54:59 +0000 |
| commit | bb9104d441db325b74b5c1008f0b8c87243d3d23 (patch) | |
| tree | d2ed84e82960d378e157acafa66fd45fc9953309 | |
| parent | 40cc26c549c63a3e773d899437e9a1706bf2fc04 (diff) | |
| download | qtserialport-bb9104d441db325b74b5c1008f0b8c87243d3d23.tar.gz | |
Fix the typo for the ParityError detection on Windows
Commit a2758cf594dd08a21037873f64f72166a353aa29 introduced
a typo when the ParityError never will be detected.
(cherry-picked from 381e11d264cbb116d37ee83a4be2ed504bffb717)
Change-Id: I2e4948fab52ae9b9de482b15ecb630f1648c9978
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| -rw-r--r-- | src/serialport/qserialport_win.cpp | 2 | ||||
| -rw-r--r-- | 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 fe9804b..2b4cfd4 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -694,7 +694,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 ff73061..150072f 100644 --- a/src/serialport/qserialport_wince.cpp +++ b/src/serialport/qserialport_wince.cpp @@ -591,7 +591,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"))); |