From 94beac615796eadd982223d0131e7c7a1418142a Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Fri, 14 Jan 2022 23:09:25 +0100 Subject: [PATCH] WTrackMenu: Use operator| instead of operator+ for QKeySequence This is forward-compatible with Qt6. --- src/widget/wtrackmenu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widget/wtrackmenu.cpp b/src/widget/wtrackmenu.cpp index f3ecc1766bb..bf7c964e52a 100644 --- a/src/widget/wtrackmenu.cpp +++ b/src/widget/wtrackmenu.cpp @@ -180,7 +180,7 @@ void WTrackMenu::createMenus() { void WTrackMenu::createActions() { const auto hideRemoveKeySequence = - QKeySequence(kHideRemoveShortcutModifier + kHideRemoveShortcutKey); + QKeySequence(kHideRemoveShortcutModifier | kHideRemoveShortcutKey); if (featureIsEnabled(Feature::AutoDJ)) { m_pAutoDJBottomAct = new QAction(tr("Add to Auto DJ Queue (bottom)"), this); @@ -245,7 +245,7 @@ void WTrackMenu::createActions() { // The keypress is caught in WTrackTableView::keyPressEvent if (m_pTrackModel) { m_pPropertiesAct->setShortcut( - QKeySequence(kPropertiesShortcutModifier + kPropertiesShortcutKey)); + QKeySequence(kPropertiesShortcutModifier | kPropertiesShortcutKey)); } connect(m_pPropertiesAct, &QAction::triggered, this, &WTrackMenu::slotShowDlgTrackInfo); }