aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Redondo <kde@david-redondo.de>2020-05-23 09:50:05 +0200
committerNate Graham <nate@kde.org>2020-05-24 19:02:17 +0000
commitd57a4a0d1ef51b3861745480e536724740c171d7 (patch)
tree0e810d183d568af23fc374ae73abae5cc1fd7f22
parent24e0799ccc85967d958b1de706186ec154f64226 (diff)
downloadkconfig-d57a4a0d1ef51b3861745480e536724740c171d7.tar.gz
kconfig-d57a4a0d1ef51b3861745480e536724740c171d7.tar.bz2
Don't try to initalize deprecated SaveOptions enum value
It will assert.
-rw-r--r--src/gui/kstandardshortcut.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kstandardshortcut.cpp b/src/gui/kstandardshortcut.cpp
index 825dfb8a..8eb61102 100644
--- a/src/gui/kstandardshortcut.cpp
+++ b/src/gui/kstandardshortcut.cpp
@@ -305,7 +305,11 @@ StandardShortcut find(const QKeySequence &seq)
if (!seq.isEmpty()) {
for (const KStandardShortcutInfo &shortcutInfo : g_infoStandardShortcut) {
const StandardShortcut id = shortcutInfo.id;
+#if KCONFIGGUI_BUILD_DEPRECATED_SINCE(5, 39)
if (id != AccelNone) {
+#else
+ if (id != AccelNone && id != SaveOptions_DEPRECATED_DO_NOT_USE) {
+#endif
if (!shortcutInfo.isInitialized) {
initialize(id);
}