Merge remote-tracking branch 'origin/3.1'

src/plugins/coreplugin/actionmanager/actionmanager.cpp

@@ -283,7 +283,6 @@ Command *ActionManager::registerShortcut(QShortcut *shortcut, Id id, const Conte
     } else {
         sc = new Shortcut(id);
         d->m_idCmdMap.insert(id, sc);
-        d->readUserSettings(id, sc);
     }
 
     if (sc->shortcut()) {
@@ -299,6 +298,7 @@ Command *ActionManager::registerShortcut(QShortcut *shortcut, Id id, const Conte
     sc->setShortcut(shortcut);
     sc->setScriptable(scriptable);
     sc->setContext(context);
+    d->readUserSettings(id, sc);
 
     emit m_instance->commandListChanged();
     emit m_instance->commandAdded(id.toString());

src/plugins/coreplugin/dialogs/shortcutsettings.cpp

@@ -200,6 +200,8 @@ void ShortcutSettings::resetTargetIdentifier()
     if (current && current->data(0, Qt::UserRole).isValid()) {
         ShortcutItem *scitem = qvariant_cast<ShortcutItem *>(current->data(0, Qt::UserRole));
         setKeySequence(scitem->m_cmd->defaultKeySequence());
+        foreach (ShortcutItem *item, m_scitems)
+            markCollisions(item);
     }
 }
 

src/plugins/coreplugin/mainwindow.cpp

@@ -351,9 +351,9 @@ void MainWindow::extensionsInitialized()
 
     emit m_coreImpl->coreAboutToOpen();
     show();
-    emit m_coreImpl->coreOpened();
     // Delay restoreWindowState, since it is overridden by LayoutRequest event
     QTimer::singleShot(0, this, SLOT(restoreWindowState()));
+    QTimer::singleShot(0, m_coreImpl, SIGNAL(coreOpened()));
 }
 
 void MainWindow::closeEvent(QCloseEvent *event)

src/plugins/coreplugin/toolsettings.cpp

@@ -89,6 +89,7 @@ static QString getUserFilePath(const QString &proposalFileName)
 static QString idFromDisplayName(const QString &displayName)
 {
     QString id = displayName;
+    id.remove(QRegExp(QLatin1String("&(?!&)")));
     QChar *c = id.data();
     while (!c->isNull()) {
         if (!c->isLetterOrNumber())