diff options
| author | Nicolas Fella <nicolas.fella@gmx.de> | 2020-12-10 22:07:34 +0100 |
|---|---|---|
| committer | Nicolas Fella <nicolas.fella@gmx.de> | 2020-12-10 22:07:34 +0100 |
| commit | 5ec83d6cb9ad7e987e56323f8cad8139b64769e7 (patch) | |
| tree | b629a76aba6588106ccfe84ec22be95733845633 /src | |
| parent | a62e53e1b1fdb363fefb74907dca339b238e99b9 (diff) | |
| download | kconfig-5ec83d6cb9ad7e987e56323f8cad8139b64769e7.tar.gz kconfig-5ec83d6cb9ad7e987e56323f8cad8139b64769e7.tar.bz2 | |
Use | instead of + for combining keys
The latter breaks with Qt6
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kstandardshortcut.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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 |