feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Shortcut settings: Update collision markers when resetting shortcut

Browse Source 
Task-number: QTCREATORBUG-6400

Change-Id: Ibef1da2fb71d157769412d7cbbd730e7656979ed
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2014-02-27 12:00:27 +01:00
parent 8a8092912b
commit 3173548a11
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/dialogs/shortcutsettings.cpp
View File

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