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/832

Reviewed-by: con <qtc-committer@nokia.com>

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);
 }