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
@@ -508,8 +508,10 @@ CANConnection* ConnectionWindow::create(CANCon::type pTye, QString pPortName, QS

 void ConnectionWindow::loadConnections()
 {
+#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
    qRegisterMetaTypeStreamOperators<CANBus>();
    qRegisterMetaTypeStreamOperators<QList<CANBus>>();
+#endif

    QSettings settings;