mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code

UI: Fix Qt6-incompatible operator usage

Browse Source 
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.
This commit is contained in:
Ryan Foster 2021-09-07 12:44:21 -04:00 committed by Jim
parent fd2aaf92b9
commit bb5820b882
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/window-basic-main.cpp
View File

@ -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);