Add multi key bindings to QShortcut

This makes it feature comparable with QAction, and makes it possible
to use as a backend for QAction, and fixes a few missing alternative
keybindings in qtwidgets.

Change-Id: Iaefc630b96c4743fc5ef429dc841870ddd99fc64
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/gui/kernel/qshortcut_p.h b/src/gui/kernel/qshortcut_p.h
index 254745960f..f62bab0297 100644
--- a/src/gui/kernel/qshortcut_p.h
+++ b/src/gui/kernel/qshortcut_p.h
@@ -55,13 +55,13 @@
 #include "qshortcut.h"
 #include <QtGui/qkeysequence.h>
 
+#include <QtCore/qlist.h>
 #include <QtCore/qstring.h>
 #include <QtCore/private/qobject_p.h>
 
 #include <private/qshortcutmap_p.h>
 
 
-
 QT_BEGIN_NAMESPACE
 
 class QShortcutMap;
@@ -79,12 +79,12 @@ public:
     virtual QShortcutMap::ContextMatcher contextMatcher() const;
     virtual bool handleWhatsThis() { return false; }
 
-    QKeySequence sc_sequence;
+    QList<QKeySequence> sc_sequences;
     QString sc_whatsthis;
     Qt::ShortcutContext sc_context = Qt::WindowShortcut;
     bool sc_enabled = true;
     bool sc_autorepeat = true;
-    int sc_id = 0;
+    QList<int> sc_ids;
     void redoGrab(QShortcutMap &map);
 };