diff options
| author | Frédéric Mercille <fmercille@homer.(none)> | 2009-07-07 20:12:01 -0400 |
|---|---|---|
| committer | Frédéric Mercille <fmercille@homer.(none)> | 2009-07-07 20:12:01 -0400 |
| commit | 718cc94a897ffbe41a0ee12096346ea62ed68e50 (patch) | |
| tree | f040ab8cc724eb6933a82122958d74777aa839a4 /src/plugins/coreplugin/actionmanager/command.cpp | |
| parent | 6bb6f5168dc895baa6352a8e86363c9a83682bc5 (diff) | |
| download | qt-creator-718cc94a897ffbe41a0ee12096346ea62ed68e50.tar.gz | |
Setting the default key sequence should only set the current sequence if none is set. Otherwise, it overrides the user configuration in QtCreator.ini.
Diffstat (limited to 'src/plugins/coreplugin/actionmanager/command.cpp')
| -rw-r--r-- | src/plugins/coreplugin/actionmanager/command.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp index f53d0138ec..539520e2ca 100644 --- a/src/plugins/coreplugin/actionmanager/command.cpp +++ b/src/plugins/coreplugin/actionmanager/command.cpp @@ -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); } |