From 00807f1fe5a20f5c23fbac104212c4a983837db9 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 29 Sep 2020 11:58:43 +0200
Subject: Simplify QAction privates

List primary and alternative key sequences and ids together, making the
logic cleaner.

Change-Id: I4eb07f9828f2b15dc66c34ceb2c4f800df73e800
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 src/gui/kernel/qaction_p.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/gui/kernel/qaction_p.h')

diff --git a/src/gui/kernel/qaction_p.h b/src/gui/kernel/qaction_p.h
index 28418c054e..77dc450a9f 100644
--- a/src/gui/kernel/qaction_p.h
+++ b/src/gui/kernel/qaction_p.h
@@ -94,8 +94,7 @@ public:
     QString statustip;
     QString whatsthis;
 #if QT_CONFIG(shortcut)
-    QKeySequence shortcut;
-    QList<QKeySequence> alternateShortcuts;
+    QList<QKeySequence> shortcuts;
 #endif
     QVariant userData;
 
@@ -104,8 +103,7 @@ public:
     virtual void setMenu(QObject *menu);
 
 #if QT_CONFIG(shortcut)
-    int shortcutId = 0;
-    QList<int> alternateShortcutIds;
+    QList<int> shortcutIds;
     Qt::ShortcutContext shortcutContext = Qt::WindowShortcut;
     uint autorepeat : 1;
 #endif
-- 
cgit v1.2.3