From 1dae4593cc38062f1649a6b1bbb8cfb8d4601c17 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Fri, 14 Jun 2019 13:16:13 +0200
Subject: [PATCH] QmlDesigner: Use MenuItem instead of Action

This avoids conflicts with shortcuts.

Task-number: QDS-803
Change-Id: I9269729cf2cb4a6bba9493d768c595748af3392d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../imports/StudioControls/ContextMenu.qml             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ContextMenu.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ContextMenu.qml
index 3365751ab61..c80d53ef3d3 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ContextMenu.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ContextMenu.qml
@@ -47,32 +47,32 @@ Menu {
     MenuSeparator {
     }
 
-    Controls2.Action {
+    Controls2.MenuItem {
         text: "Copy"
         enabled: myTextEdit.selectedText !== ""
         onTriggered: myTextEdit.copy()
         /* shortcut: StandardKey.Copy Shortcuts in QQC2 seem to override global shortcuts */
     }
-    Controls2.Action {
+    Controls2.MenuItem {
         text: "Cut"
         enabled: myTextEdit.selectedText !== "" && !myTextEdit.readOnly
         onTriggered: myTextEdit.cut()
         /* shortcut: StandardKey.Cut Shortcuts in QQC2 seem to override global shortcuts */
     }
-    Controls2.Action {
+    Controls2.MenuItem {
         text: "Paste"
         enabled: myTextEdit.canPaste
         onTriggered: myTextEdit.paste()
         /* shortcut: StandardKey.Paste Shortcuts in QQC2 seem to override global shortcuts */
     }
-    Controls2.Action {
+    Controls2.MenuItem {
         text: "Delete"
         enabled: myTextEdit.selectedText !== ""
         onTriggered: myTextEdit.remove(myTextEdit.selectionStart,
                                        myTextEdit.selectionEnd)
         /* shortcut: StandardKey.Delete Shortcuts in QQC2 seem to override global shortcuts */
     }
-    Controls2.Action {
+    Controls2.MenuItem {
         text: "Clear"
         enabled: myTextEdit.text !== ""
         onTriggered: myTextEdit.clear()