From 3173548a118d01d97a83613cdddfc588e1640f52 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Thu, 27 Feb 2014 12:00:27 +0100
Subject: [PATCH] Shortcut settings: Update collision markers when resetting
 shortcut

Task-number: QTCREATORBUG-6400

Change-Id: Ibef1da2fb71d157769412d7cbbd730e7656979ed
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
 src/plugins/coreplugin/dialogs/shortcutsettings.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index c9d1e996d85..af679852914 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/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);
     }
 }