Sfoglia il codice sorgente

UI: Fix Qt6-incompatible operator usage

Commit 60d95cb5 introduced some code that used the + operator on two
Qt::Modifier items. Using a pipe operator instead fixes the compilation
error on Qt5 and Qt6.
Ryan Foster 4 anni fa
parent
commit
bb5820b882
1 ha cambiato i file con 1 aggiunte e 1 eliminazioni
  1. 1 1
      UI/window-basic-main.cpp

+ 1 - 1
UI/window-basic-main.cpp

@@ -386,7 +386,7 @@ OBSBasic::OBSBasic(QWidget *parent)
 	// Register shortcuts for Undo/Redo
 	ui->actionMainUndo->setShortcut(Qt::CTRL + Qt::Key_Z);
 	QList<QKeySequence> shrt;
-	shrt << QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Z)
+	shrt << QKeySequence(Qt::CTRL | Qt::SHIFT + Qt::Key_Z)
 	     << QKeySequence(Qt::CTRL + Qt::Key_Y);
 	ui->actionMainRedo->setShortcuts(shrt);