Porting to Qt6 + newer rtmidi

Author: olizajac

hairless-midiserial.pro

@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui
+QT       += widgets
 
 TARGET = hairless-midiserial
 TEMPLATE = app

libraries/rtmidi

@@ -2,7 +2,7 @@
 #define BLINKENLIGHT_H
 
 #include <QObject>
-#include <QLabel>
+#include <QtWidgets/QLabel>
 #include <QTimer>
 
 /*

src/BlinkenLight.h

@@ -216,7 +216,7 @@ void Bridge::sendMidiMessage() {
   if(msg_data.length() == 0)
     return;
   if(bufferStartsWith(MSG_DEBUG)) {
-      QString debug_msg = QString::fromAscii(msg_data.mid(4, msg_data[3]).data());
+      QString debug_msg = QString::fromLatin1(msg_data.mid(4, msg_data[3]).data());
       emit displayMessage(applyTimeStamp(QString("Serial Says: %1").arg(debug_msg)));
   } else {
       emit debugMessage(applyTimeStamp(QString("Serial In: %1").arg(describeMIDI(msg_data))));

src/Bridge.cpp

@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include "ui/mainwindow.h"
 
 int main(int argc, char *argv[])

src/main.cpp

@@ -7,7 +7,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
 {
     ui->setupUi(this);
 
-    QString text = ui->label_info->text().arg(QString::fromAscii(VERSION)).arg(QString::fromAscii(__DATE__));
+    QString text = ui->label_info->text().arg(QString::fromLatin1(VERSION)).arg(QString::fromLatin1(__DATE__));
     ui->label_info->setText(text);
 }
 

src/ui/aboutdialog.cpp

@@ -1,7 +1,7 @@
 #ifndef ABOUTDIALOG_H
 #define ABOUTDIALOG_H
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 namespace Ui {
     class About;

src/ui/aboutdialog.h

@@ -1,11 +1,11 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QMainWindow>
-#include <QComboBox>
-#include <QLabel>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QLabel>
 #include <QTime>
-#include <QMenuBar>
+#include <QtWidgets/QMenuBar>
 #include <QTimer>
 #include "RtMidi.h"
 #include "Bridge.h"

src/ui/mainwindow.h

@@ -1,7 +1,7 @@
 #ifndef SETTINGSDIALOG_H
 #define SETTINGSDIALOG_H
 
-#include <QDialog>
+#include <QTWidgets/QDialog>
 
 namespace Ui {
     class SettingsDialog;