From 6849690da9f72aeb0d27e04bd98d121f63618557 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Fri, 17 Aug 2018 17:49:26 +0200
Subject: [PATCH] remove common actions from toolbar

This removes paste, copy, cut, delete, undo and do action icons
from the toolbar to make space for more important icons.

Change-Id: I8b0db80521e0848c93d4eb9d20796a5376d7e08e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../components/componentcore/designeractionmanager.cpp        | 4 ++--
 .../components/componentcore/modelnodecontextmenu_helper.h    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
index 6bc247d143c..b75e4b60544 100644
--- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
@@ -669,7 +669,7 @@ void DesignerActionManager::createDefaultDesignerActions()
                           &toBack,
                           &singleSelection));
 
-    addDesignerAction(new ModelNodeAction(
+    addDesignerAction(new ModelNodeFormEditorAction(
                           raiseCommandId, raiseDisplayName,
                           Utils::Icon({{":/qmldesigner/icon/designeractions/images/raise.png", Utils::Theme::IconsBaseColor}}).icon(),
                           raiseToolTip,
@@ -679,7 +679,7 @@ void DesignerActionManager::createDefaultDesignerActions()
                           &raise,
                           &raiseAvailable));
 
-    addDesignerAction(new ModelNodeAction(
+    addDesignerAction(new ModelNodeFormEditorAction(
                           lowerCommandId,
                           lowerDisplayName,
                           Utils::Icon({{":/qmldesigner/icon/designeractions/images/lower.png", Utils::Theme::IconsBaseColor}}).icon(),
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h
index 6d9f9041494..435d3913237 100644
--- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h
+++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h
@@ -180,7 +180,7 @@ public:
     QByteArray category() const override  { return m_category; }
     QByteArray menuId() const override  { return QByteArray(); }
     int priority() const override { return m_priority; }
-    Type type() const override { return Action; }
+    Type type() const override { return ContextMenuAction; }
     void currentContextChanged(const SelectionContext &) override {}
 
 private: