Highlight colliding shortcuts for imported keyboard schemes.

2010-03-29 14:42:46 +02:00
parent 4dda485353
commit 7e1f9d9f85
8 changed files with 86 additions and 52 deletions
--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -238,6 +238,11 @@ QShortcut *CommandPrivate::shortcut() const
    return 0;
 }

+QList<int> CommandPrivate::context() const
+{
+    return m_context;
+}
+
 void CommandPrivate::setAttribute(CommandAttribute attr)
 {
    m_attributes |= attr;