diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2016-10-14 17:18:24 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2016-10-14 15:20:00 +0000 |
| commit | 5da074f95a0a8fcc548a5b0bad4fe50a5fa11e5a (patch) | |
| tree | 0a5d23a3b2a4045e92c72162559f3f3f2b3484a5 /src/plugins/qmldesigner/shortcutmanager.cpp | |
| parent | f70d1359c0df15139be96c711b2df6174d09a1ce (diff) | |
QmlDesigner: Fix ESC issues
We do not want to switch to the editor whenever pressing ESCAPE.
Using shortcut override does not work for QQuickWidget.
Therefore we register our own action and disable it.
Change-Id: I399265a5254767d2825edf3fe823dd35177a6ce5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/shortcutmanager.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/shortcutmanager.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp index d06f32c118..417eeb3480 100644 --- a/src/plugins/qmldesigner/shortcutmanager.cpp +++ b/src/plugins/qmldesigner/shortcutmanager.cpp @@ -218,6 +218,11 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex command->setAttribute(Core::Command::CA_Hide); viewsMenu->addAction(command); + /* Registering disabled action for Escape, because Qt Quick does not support shortcut overrides. */ + command = Core::ActionManager::registerAction(&m_escapeAction, Core::Constants::S_RETURNTOEDITOR, qmlDesignerMainContext); + command->setDefaultKeySequence(QKeySequence(Qt::Key_Escape)); + m_escapeAction.setEnabled(false); + Core::ActionManager::registerAction(&m_hideSidebarsAction, Core::Constants::TOGGLE_SIDEBAR, qmlDesignerMainContext); } |