1 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
index faeed00e07..8b03fee9e5 100644
--- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
@@ -83,9 +83,9 @@ CommandsFile::CommandsFile(const QString &filename)
 /*!
     \internal
 */
-QMap<QString, QKeySequence> CommandsFile::importCommands() const
+QMap<QString, QList<QKeySequence>> CommandsFile::importCommands() const
 {
-    QMap<QString, QKeySequence> result;
+    QMap<QString, QList<QKeySequence>> result;
 
     QFile file(m_filename);
     if (!file.open(QIODevice::ReadOnly|QIODevice::Text))
@@ -101,19 +101,17 @@ QMap<QString, QKeySequence> CommandsFile::importCommands() const
         case QXmlStreamReader::StartElement: {
             const QStringRef name = r.name();
             if (name == ctx.shortCutElement) {
-                if (!currentId.isEmpty()) // shortcut element without key element == empty shortcut
-                    result.insert(currentId, QKeySequence());
                 currentId = r.attributes().value(ctx.idAttribute).toString();
+                if (!result.contains(currentId))
+                    result.insert(currentId, {});
             } else if (name == ctx.keyElement) {
-                QTC_ASSERT(!currentId.isEmpty(), return result);
+                QTC_ASSERT(!currentId.isEmpty(), continue);
                 const QXmlStreamAttributes attributes = r.attributes();
                 if (attributes.hasAttribute(ctx.valueAttribute)) {
                     const QString keyString = attributes.value(ctx.valueAttribute).toString();
-                    result.insert(currentId, QKeySequence(keyString));
-                } else {
-                    result.insert(currentId, QKeySequence());
+                    QList<QKeySequence> keys = result.value(currentId);
+                    result.insert(currentId, keys << QKeySequence(keyString));
                 }
-                currentId.clear();
             } // if key element
         } // case QXmlStreamReader::StartElement
         default:
@@ -144,14 +142,16 @@ bool CommandsFile::exportCommands(const QList<ShortcutItem *> &items)
         w.writeStartElement(ctx.mappingElement);
         foreach (const ShortcutItem *item, items) {
             const Id id = item->m_cmd->id();
-            if (item->m_key.isEmpty()) {
+            if (item->m_keys.isEmpty() || item->m_keys.first().isEmpty()) {
                 w.writeEmptyElement(ctx.shortCutElement);
                 w.writeAttribute(ctx.idAttribute, id.toString());
             } else {
                 w.writeStartElement(ctx.shortCutElement);
                 w.writeAttribute(ctx.idAttribute, id.toString());
-                w.writeEmptyElement(ctx.keyElement);
-                w.writeAttribute(ctx.valueAttribute, item->m_key.toString());
+                for (const QKeySequence &k : item->m_keys) {
+                    w.writeEmptyElement(ctx.keyElement);
+                    w.writeAttribute(ctx.valueAttribute, k.toString());
+                }
                 w.writeEndElement(); // Shortcut
             }
         }