fix errors building on Qt 6

openvpi · Oct 28, 2024 · 8208c89 · 8208c89
1 parent 2cccb0c
commit 8208c89
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 15 deletions.
diff --git a/libs/choruskit b/libs/choruskit
diff --git a/libs/qtmediate b/libs/qtmediate
diff --git a/libs/stimmt b/libs/stimmt
diff --git a/libs/substate b/libs/substate
diff --git a/libs/svscraft b/libs/svscraft
diff --git a/src/plugins/audioplugin/internal/subsystem/vstconnectionsystem.cpp b/src/plugins/audioplugin/internal/subsystem/vstconnectionsystem.cpp
@@ -3,6 +3,7 @@
 #include <QApplication>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QFile>
 
 #include <TalcsCore/MixerAudioSource.h>
 #include <TalcsCore/NoteSynthesizer.h>

diff --git a/src/plugins/coreplugin/internal/settings/menutoolbarpage.cpp b/src/plugins/coreplugin/internal/settings/menutoolbarpage.cpp
@@ -82,22 +82,22 @@ namespace Core {
 
             {
                 auto addActionAction = toolbar->addAction(style()->standardIcon(QStyle::SP_DialogApplyButton), tr("Add &Action"), this, &MenuToolbarPageWidget::handleAddAction);
-                addActionAction->setShortcut(Qt::ALT + Qt::Key_Insert);
+                addActionAction->setShortcut(Qt::ALT | Qt::Key_Insert);
                 addActionAction->setDisabled(true);
                 auto addSeparatorAction = toolbar->addAction(style()->standardIcon(QStyle::SP_DialogYesButton), tr("Add &Separator"), this, &MenuToolbarPageWidget::handleAddSeparator);
-                addSeparatorAction->setShortcut(Qt::ALT + Qt::SHIFT + Qt::Key_Insert);
+                addSeparatorAction->setShortcut(Qt::ALT | Qt::SHIFT | Qt::Key_Insert);
                 addSeparatorAction->setDisabled(true);
                 auto removeAction = toolbar->addAction(style()->standardIcon(QStyle::SP_DialogDiscardButton), tr("&Remove"), this, &MenuToolbarPageWidget::handleRemove);
-                removeAction->setShortcut(Qt::ALT + Qt::Key_Delete);
+                removeAction->setShortcut(Qt::ALT | Qt::Key_Delete);
                 removeAction->setDisabled(true);
                 auto editIconAction = toolbar->addAction(style()->standardIcon(QStyle::SP_DialogResetButton), tr("&Edit Icon"), this, &MenuToolbarPageWidget::handleEditIcon);
                 editIconAction->setShortcut(Qt::Key_F4);
                 editIconAction->setDisabled(true);
                 auto moveUpAction = toolbar->addAction(style()->standardIcon(QStyle::SP_ArrowUp), tr("Move &Up"), this, &MenuToolbarPageWidget::handleMoveUp);
-                moveUpAction->setShortcut(Qt::ALT + Qt::Key_Up);
+                moveUpAction->setShortcut(Qt::ALT | Qt::Key_Up);
                 moveUpAction->setDisabled(true);
                 auto moveDownAction = toolbar->addAction(style()->standardIcon(QStyle::SP_ArrowDown), tr("Move &Down"), this, &MenuToolbarPageWidget::handleMoveDown);
-                moveDownAction->setShortcut(Qt::ALT + Qt::Key_Down);
+                moveDownAction->setShortcut(Qt::ALT | Qt::Key_Down);
                 moveDownAction->setDisabled(true);
                 toolbar->addSeparator();
                 auto searchLineEdit = new QLineEdit;

diff --git a/src/plugins/coreplugin/internal/widgets/homerecentwidget.cpp b/src/plugins/coreplugin/internal/widgets/homerecentwidget.cpp
@@ -28,7 +28,7 @@ namespace Core::Internal {
         AppExtra::autoPolishPopupMenu(searchBox);
 
         topLayout = new QMEqualBoxLayout(QBoxLayout::LeftToRight);
-        topLayout->setMargin(0);
+        topLayout->setContentsMargins(0, 0, 0, 0);
         topLayout->setSpacing(0);
         topLayout->addWidget(searchBox);
         setLayout(topLayout);
@@ -67,7 +67,7 @@ namespace Core::Internal {
         emptyLabel->setObjectName("empty-label");
 
         bottomLayout = new QVBoxLayout();
-        bottomLayout->setMargin(0);
+        bottomLayout->setContentsMargins(0, 0, 0, 0);
         bottomLayout->setSpacing(0);
 
         bottomLayout->addWidget(fileWidget);

diff --git a/src/plugins/iemgr/internal/dialogs/homedialog.cpp b/src/plugins/iemgr/internal/dialogs/homedialog.cpp
@@ -23,7 +23,7 @@ namespace IEMgr::Internal {
 
         // Left
         leftLayout = new QVBoxLayout();
-        leftLayout->setMargin(0);
+        leftLayout->setContentsMargins(0, 0, 0, 0);
         leftLayout->setSpacing(0);
 
         buttonGroup = new QButtonGroup(this);
@@ -43,7 +43,7 @@ namespace IEMgr::Internal {
         browseButton = new QPushButton(tr("Browse"));
 
         textButtonLayout = new QHBoxLayout();
-        textButtonLayout->setMargin(0);
+        textButtonLayout->setContentsMargins(0, 0, 0, 0);
         textButtonLayout->setSpacing(0);
 
         hintLabel = new QLabel();
@@ -53,7 +53,7 @@ namespace IEMgr::Internal {
         textButtonLayout->addWidget(browseButton);
 
         rightLayout = new QVBoxLayout();
-        rightLayout->setMargin(0);
+        rightLayout->setContentsMargins(0, 0, 0, 0);
         rightLayout->setSpacing(0);
         rightLayout->addLayout(textButtonLayout);
         rightLayout->addWidget(hintLabel);

diff --git a/src/plugins/lyrictool/core/lyricinfo.cpp b/src/plugins/lyrictool/core/lyricinfo.cpp
@@ -1,5 +1,7 @@
 #include "lyricinfo.h"
 
+#include <QStringList>
+
 namespace LyricTool {
 
     class LyricInfoData : public QSharedData {