Merge branch 'master' of github.com:collin80/SavvyCAN

2022-10-04 19:59:46 -04:00
parent 61b49c9126 ce9701c4a0
commit 7678a498db
30 changed files with 676 additions and 138 deletions
@@ -485,6 +485,7 @@ void GVRetSerial::serialError(QSerialPort::SerialPortError err)
        killConnection = true;
        piStop();
        break;
+#if QT_VERSION <= QT_VERSION_CHECK( 6, 0, 0 )
    case QSerialPort::ParityError:
        errMessage = "Parity error on serial port";
        break;
@@ -494,6 +495,7 @@ void GVRetSerial::serialError(QSerialPort::SerialPortError err)
    case QSerialPort::BreakConditionError:
        errMessage = "Break error on serial port";
        break;
+#endif
    case QSerialPort::WriteError:
        errMessage = "Write error on serial port";
        piStop();