diff options
author | Thomas Hartmann <thomas.hartmann@qt.io> | 2017-02-07 12:59:38 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2017-02-07 14:47:30 +0000 |
commit | 7b66a7427effc19fff660fac48dd7f6ca46b0ee5 (patch) | |
tree | dd25d341f0f1e9d469a01e26838f96e4040f2f7d /src/plugins/qmldesigner/shortcutmanager.cpp | |
parent | f04f09e17c1857cffba1ca3ae4ecabe3caa8bfca (diff) |
QmlDesigner: Crash fix
Deleting or cutting the root node is not possible.
Task-number: QTCREATORBUG-17646
Change-Id: I613179c291e744c2d2f6e44ce103bcbd2afaed28
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/shortcutmanager.cpp')
-rw-r--r-- | src/plugins/qmldesigner/shortcutmanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp index facfbecce3..6f25e53d66 100644 --- a/src/plugins/qmldesigner/shortcutmanager.cpp +++ b/src/plugins/qmldesigner/shortcutmanager.cpp @@ -268,9 +268,9 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex Core::ActionManager::registerAction(&m_hideSidebarsAction, Core::Constants::TOGGLE_SIDEBAR, qmlDesignerMainContext); - connect(designerActionManager.view(), &DesignerActionManagerView::selectionChanged, this, [this](bool itemsSelected) { - m_deleteAction.setEnabled(itemsSelected); - m_cutAction.setEnabled(itemsSelected); + connect(designerActionManager.view(), &DesignerActionManagerView::selectionChanged, this, [this](bool itemsSelected, bool rootItemIsSelected) { + m_deleteAction.setEnabled(itemsSelected && !rootItemIsSelected); + m_cutAction.setEnabled(itemsSelected && !rootItemIsSelected); m_copyAction.setEnabled(itemsSelected); }); |