Commit 6936d5c7 authored by con's avatar con

Integrate merge-request #832 into branch 'master'

Frédéric Mercille (1):
      Setting the default key sequence should only set the current sequence
         if none is set. Otherwise, it overrides the user configuration in
         QtCreator.ini.

Request-url: http://gitorious.org/qt-creator/qt-creator/merge_requests/832Reviewed-by: default avatarcon <qtc-committer@nokia.com>
parents 97f8850a 718cc94a
......@@ -384,7 +384,8 @@ QList<CommandLocation> Action::locations() const
void Action::setDefaultKeySequence(const QKeySequence &key)
{
setKeySequence(key);
if(m_action->shortcut().isEmpty())
setKeySequence(key);
CommandPrivate::setDefaultKeySequence(key);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment