From a4b1e1ccdc978384792524a9871a321d99fc9165 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Thu, 21 Sep 2023 17:35:03 +0200 Subject: [PATCH] QmlDesigner: Deactivate layout shortcut for MCU Change-Id: I80c247155aabae54b826e950e7c9a93ab75dfc47 Reviewed-by: Aleksei German Reviewed-by: Qt CI Patch Build Bot --- .../componentcore/designeractionmanager.cpp | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index 2d7d452ecd5..098376f0fe9 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -1810,29 +1810,31 @@ void DesignerActionManager::createDefaultDesignerActions() &isStackedContainerAndIndexCanBeIncreased, &isStackedContainer)); - addDesignerAction(new ModelNodeAction( - layoutRowLayoutCommandId, - layoutRowLayoutDisplayName, - Utils::Icon({{":/qmldesigner/icon/designeractions/images/row.png", - Utils::Theme::IconsBaseColor}}).icon(), - layoutRowLayoutToolTip, - layoutCategory, - QKeySequence("Ctrl+u"), - 2, - &layoutRowLayout, - &selectionCanBeLayoutedAndQtQuickLayoutPossible)); + addDesignerAction( + new ModelNodeAction(layoutRowLayoutCommandId, + layoutRowLayoutDisplayName, + Utils::Icon({{":/qmldesigner/icon/designeractions/images/row.png", + Utils::Theme::IconsBaseColor}}) + .icon(), + layoutRowLayoutToolTip, + layoutCategory, + QKeySequence("Ctrl+u"), + 2, + &layoutRowLayout, + &selectionCanBeLayoutedAndQtQuickLayoutPossibleAndNotMCU)); - addDesignerAction(new ModelNodeAction( - layoutColumnLayoutCommandId, - layoutColumnLayoutDisplayName, - Utils::Icon({{":/qmldesigner/icon/designeractions/images/column.png", - Utils::Theme::IconsBaseColor}}).icon(), - layoutColumnLayoutToolTip, - layoutCategory, - QKeySequence("Ctrl+l"), - 3, - &layoutColumnLayout, - &selectionCanBeLayoutedAndQtQuickLayoutPossible)); + addDesignerAction( + new ModelNodeAction(layoutColumnLayoutCommandId, + layoutColumnLayoutDisplayName, + Utils::Icon({{":/qmldesigner/icon/designeractions/images/column.png", + Utils::Theme::IconsBaseColor}}) + .icon(), + layoutColumnLayoutToolTip, + layoutCategory, + QKeySequence("Ctrl+l"), + 3, + &layoutColumnLayout, + &selectionCanBeLayoutedAndQtQuickLayoutPossibleAndNotMCU)); addDesignerAction(new ModelNodeAction( layoutGridLayoutCommandId,