diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2017-05-19 14:33:54 +0200 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2017-05-22 09:18:49 +0000 |
| commit | 3869af3a1505caeef878b655aaea9a108f7e04cd (patch) | |
| tree | 70d35a89cdac8af22d82221b033552fb14bc1c09 /src/plugins/qmldesigner/shortcutmanager.cpp | |
| parent | 602f1e1369befdc270acbbb62b2edc09365f813e (diff) | |
QmlDesigner: Avoid conflicts in shortcuts
Some shortcuts for the toolbar were still conflicting
with the text editor.
Change-Id: I4cad3c9a1f4978ea75b74cc58b789c12fdde871c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/shortcutmanager.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/shortcutmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp index e5a72bf18c..9641a20cf0 100644 --- a/src/plugins/qmldesigner/shortcutmanager.cpp +++ b/src/plugins/qmldesigner/shortcutmanager.cpp @@ -229,7 +229,7 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex command = Core::ActionManager::registerAction(&m_collapseExpandStatesAction, Constants::TOGGLE_STATES_EDITOR, qmlDesignerMainContext); command->setAttribute(Core::Command::CA_Hide); - command->setDefaultKeySequence(QKeySequence("Ctrl+Shift+s")); + command->setDefaultKeySequence(QKeySequence("Ctrl+Alt+s")); viewsMenu->addAction(command); command = Core::ActionManager::registerAction(&m_restoreDefaultViewAction, Constants::RESTORE_DEFAULT_VIEW, qmlDesignerMainContext); |