From 5ec83d6cb9ad7e987e56323f8cad8139b64769e7 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Thu, 10 Dec 2020 22:07:34 +0100 Subject: Use | instead of + for combining keys The latter breaks with Qt6 --- src/gui/kstandardshortcut.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/gui/kstandardshortcut.cpp b/src/gui/kstandardshortcut.cpp index df5ebe4b..c55d71c3 100644 --- a/src/gui/kstandardshortcut.cpp +++ b/src/gui/kstandardshortcut.cpp @@ -47,11 +47,11 @@ struct KStandardShortcutInfo { Category category; }; -#define CTRL(x) Qt::CTRL+Qt::Key_##x -#define SHIFT(x) Qt::SHIFT+Qt::Key_##x -#define CTRLSHIFT(x) Qt::CTRL+Qt::SHIFT+Qt::Key_##x -#define ALT(x) Qt::ALT+Qt::Key_##x -#define ALTSHIFT(x) Qt::ALT+Qt::SHIFT+Qt::Key_##x +#define CTRL(x) Qt::CTRL|Qt::Key_##x +#define SHIFT(x) Qt::SHIFT|Qt::Key_##x +#define CTRLSHIFT(x) Qt::CTRL|Qt::SHIFT|Qt::Key_##x +#define ALT(x) Qt::ALT|Qt::Key_##x +#define ALTSHIFT(x) Qt::ALT|Qt::SHIFT|Qt::Key_##x /** Array of predefined KStandardShortcutInfo objects, which cover all the "standard" accelerators. Each enum value from StandardShortcut -- cgit v1.2.1