32 files changed, 86 insertions, 86 deletions
diff --git a/src/quickcontrols/basic/TextArea.qml b/src/quickcontrols/basic/TextArea.qml
index 493046186a..e4b6a27448 100644
--- a/src/quickcontrols/basic/TextArea.qml
+++ b/src/quickcontrols/basic/TextArea.qml
@@ -26,7 +26,7 @@ T.TextArea {
     selectedTextColor: control.palette.highlightedText
 
     ContextMenu.menu: TextEditingContextMenu {
-        control: control
+        editor: control
     }
 
     background: Rectangle {
diff --git a/src/quickcontrols/basic/TextField.qml b/src/quickcontrols/basic/TextField.qml
index 293817f81e..225ca259f5 100644
--- a/src/quickcontrols/basic/TextField.qml
+++ b/src/quickcontrols/basic/TextField.qml
@@ -26,7 +26,7 @@ T.TextField {
     verticalAlignment: TextInput.AlignVCenter
 
     ContextMenu.menu: TextEditingContextMenu {
-        control: control
+        editor: control
     }
 
     PlaceholderText {
diff --git a/src/quickcontrols/basic/impl/TextEditingContextMenu.qml b/src/quickcontrols/basic/impl/TextEditingContextMenu.qml
index 3cd5027f9e..d2bbad8b6e 100644
--- a/src/quickcontrols/basic/impl/TextEditingContextMenu.qml
+++ b/src/quickcontrols/basic/impl/TextEditingContextMenu.qml
@@ -9,24 +9,24 @@ Menu {
     id: menu
     popupType: Qt.platform.pluginName !== "wayland" ? Popup.Window : Popup.Item
 
-    required property var control
+    required property var editor
 
     CutAction {
-        control: menu.control
+        editor: menu.editor
     }
     CopyAction {
-        control: menu.control
+        editor: menu.editor
     }
     PasteAction {
-        control: menu.control
+        editor: menu.editor
     }
     DeleteAction {
-        control: menu.control
+        editor: menu.editor
     }
 
     MenuSeparator {}
 
     SelectAllAction {
-        control: menu.control
+        editor: menu.editor
     }
 }
diff --git a/src/quickcontrols/fluentwinui3/TextArea.qml b/src/quickcontrols/fluentwinui3/TextArea.qml
index 5f843430a6..ccfb4de0f6 100644
--- a/src/quickcontrols/fluentwinui3/TextArea.qml
+++ b/src/quickcontrols/fluentwinui3/TextArea.qml
@@ -40,7 +40,7 @@ T.TextArea {
     readonly property var __config: Config.controls.textarea[__currentState] || {}
 
     ContextMenu.menu: Impl.TextEditingContextMenu {
-        control: control
+        editor: control
     }
 
     PlaceholderText {
diff --git a/src/quickcontrols/fluentwinui3/TextField.qml b/src/quickcontrols/fluentwinui3/TextField.qml
index d3d654d948..71894719bf 100644
--- a/src/quickcontrols/fluentwinui3/TextField.qml
+++ b/src/quickcontrols/fluentwinui3/TextField.qml
@@ -40,7 +40,7 @@ T.TextField {
     verticalAlignment: Text.AlignVCenter
 
     ContextMenu.menu: Impl.TextEditingContextMenu {
-        control: control
+        editor: control
     }
 
     PlaceholderText {
diff --git a/src/quickcontrols/fluentwinui3/impl/TextEditingContextMenu.qml b/src/quickcontrols/fluentwinui3/impl/TextEditingContextMenu.qml
index 6eaa998873..b0ede4dcc1 100644
--- a/src/quickcontrols/fluentwinui3/impl/TextEditingContextMenu.qml
+++ b/src/quickcontrols/fluentwinui3/impl/TextEditingContextMenu.qml
@@ -9,24 +9,24 @@ Menu {
     id: menu
     popupType: Qt.platform.pluginName !== "wayland" ? Popup.Window : Popup.Item
 
-    required property var control
+    required property var editor
 
     FluentWinUI3Impl.CutAction {
-        control: menu.control
+        editor: menu.editor
     }
     FluentWinUI3Impl.CopyAction {
-        control: menu.control
+        editor: menu.editor
     }
     FluentWinUI3Impl.PasteAction {
-        control: menu.control
+        editor: menu.editor
     }
     FluentWinUI3Impl.DeleteAction {
-        control: menu.control
+        editor: menu.editor
     }
 
     MenuSeparator {}
 
     FluentWinUI3Impl.SelectAllAction {
-        control: menu.control
+        editor: menu.editor
     }
 }
diff --git a/src/quickcontrols/fusion/TextArea.qml b/src/quickcontrols/fusion/TextArea.qml
index f137d14a6e..074173dbf2 100644
--- a/src/quickcontrols/fusion/TextArea.qml
+++ b/src/quickcontrols/fusion/TextArea.qml
@@ -26,7 +26,7 @@ T.TextArea {
     placeholderTextColor: control.palette.placeholderText
 
     ContextMenu.menu: TextEditingContextMenu {
-        control: control
+        editor: control
     }
 
     PlaceholderText {
diff --git a/src/quickcontrols/fusion/TextField.qml b/src/quickcontrols/fusion/TextField.qml
index 7941fd9f23..55f4e0a3a9 100644
--- a/src/quickcontrols/fusion/TextField.qml
+++ b/src/quickcontrols/fusion/TextField.qml
@@ -26,7 +26,7 @@ T.TextField {
     verticalAlignment: TextInput.AlignVCenter
 
     ContextMenu.menu: TextEditingContextMenu {
-        control: control
+        editor: control
     }
 
     PlaceholderText {
diff --git a/src/quickcontrols/fusion/impl/TextEditingContextMenu.qml b/src/quickcontrols/fusion/impl/TextEditingContextMenu.qml
index b55c5a5a1a..f9ac5e4e09 100644
--- a/src/quickcontrols/fusion/impl/TextEditingContextMenu.qml
+++ b/src/quickcontrols/fusion/impl/TextEditingContextMenu.qml
@@ -9,24 +9,24 @@ Menu {
     id: menu
     popupType: Qt.platform.pluginName !== "wayland" ? Popup.Window : Popup.Item
 
-    required property var control
+    required property var editor
 
     FusionImpl.CutAction {
-        control: menu.control
+        editor: menu.editor
     }
     FusionImpl.CopyAction {
-        control: menu.control
+        editor: menu.editor
     }
     FusionImpl.PasteAction {
-        control: menu.control
+        editor: menu.editor
     }
     FusionImpl.DeleteAction {
-        control: menu.control
+        editor: menu.editor
     }
 
     MenuSeparator {}
 
     FusionImpl.SelectAllAction {
-        control: menu.control
+        editor: menu.editor
     }
 }
diff --git a/src/quickcontrols/imagine/TextArea.qml b/src/quickcontrols/imagine/TextArea.qml
index 18d85e06a2..30b7ddb8e7 100644
--- a/src/quickcontrols/imagine/TextArea.qml
+++ b/src/quickcontrols/imagine/TextArea.qml
@@ -35,7 +35,7 @@ T.TextArea {
     placeholderTextColor: control.palette.placeholderText
 
     ContextMenu.menu: TextEditingContextMenu {
-        control: control
+        editor: control
     }
 
     PlaceholderText {
diff --git a/src/quickcontrols/imagine/TextField.qml b/src/quickcontrols/imagine/TextField.qml
index e702304603..acc3c5027e 100644
--- a/src/quickcontrols/imagine/TextField.qml
+++ b/src/quickcontrols/imagine/TextField.qml
@@ -34,7 +34,7 @@ T.TextField {
     verticalAlignment: Qt.AlignVCenter
 
     ContextMenu.menu: TextEditingContextMenu {
-        control: control
+        editor: control
     }
 
     PlaceholderText {
diff --git a/src/quickcontrols/imagine/impl/TextEditingContextMenu.qml b/src/quickcontrols/imagine/impl/TextEditingContextMenu.qml
index 8065477200..4ebe6e85d3 100644
--- a/src/quickcontrols/imagine/impl/TextEditingContextMenu.qml
+++ b/src/quickcontrols/imagine/impl/TextEditingContextMenu.qml
@@ -9,24 +9,24 @@ Menu {
     id: menu
     popupType: Qt.platform.pluginName !== "wayland" ? Popup.Window : Popup.Item
 
-    required property var control
+    required property var editor
 
     CutAction {
-        control: menu.control
+        editor: menu.editor
     }
     CopyAction {
-        control: menu.control
+        editor: menu.editor
     }
     PasteAction {
-        control: menu.control
+        editor: menu.editor
     }
     DeleteAction {
-        control: menu.control
+        editor: menu.editor
     }
 
     MenuSeparator {}
 
     SelectAllAction {
-        control: menu.control
+        editor: menu.editor
     }
 }
diff --git a/src/quickcontrols/ios/TextArea.qml b/src/quickcontrols/ios/TextArea.qml
index 4bcc2384d3..63554e17eb 100644
--- a/src/quickcontrols/ios/TextArea.qml
+++ b/src/quickcontrols/ios/TextArea.qml
@@ -27,7 +27,7 @@ T.TextArea {
     cursorDelegate: CursorDelegate {}
 
     ContextMenu.menu: TextEditingContextMenu {
-        control: control
+        editor: control
     }
 
     PlaceholderText {
diff --git a/src/quickcontrols/ios/TextField.qml b/src/quickcontrols/ios/TextField.qml
index a26e221141..639a45aae6 100644
--- a/src/quickcontrols/ios/TextField.qml
+++ b/src/quickcontrols/ios/TextField.qml
@@ -29,7 +29,7 @@ T.TextField {
     cursorDelegate: CursorDelegate {}
 
     ContextMenu.menu: TextEditingContextMenu {
-        control: control
+        editor: control
     }
 
     PlaceholderText {
diff --git a/src/quickcontrols/ios/impl/TextEditingContextMenu.qml b/src/quickcontrols/ios/impl/TextEditingContextMenu.qml
index a40f8e8546..f2b9d7c5b3 100644
--- a/src/quickcontrols/ios/impl/TextEditingContextMenu.qml
+++ b/src/quickcontrols/ios/impl/TextEditingContextMenu.qml
@@ -9,24 +9,24 @@ Menu {
     id: menu
     popupType: Popup.Native
 
-    required property var control
+    required property var editor
 
     IOSImpl.CutAction {
-        control: menu.control
+        editor: menu.editor
     }
     IOSImpl.CopyAction {
-        control: menu.control
+        editor: menu.editor
     }
     IOSImpl.PasteAction {
-        control: menu.control
+        editor: menu.editor
     }
     IOSImpl.DeleteAction {
-        control: menu.control
+        editor: menu.editor
     }
 
     MenuSeparator {}
 
     IOSImpl.SelectAllAction {
-        control: menu.control
+        editor: menu.editor
     }
 }
diff --git a/src/quickcontrols/macos/TextArea.qml b/src/quickcontrols/macos/TextArea.qml
index 0ccbcc5239..4307aaef08 100644
--- a/src/quickcontrols/macos/TextArea.qml
+++ b/src/quickcontrols/macos/TextArea.qml
@@ -10,6 +10,6 @@ NativeStyle.DefaultTextArea {
     id: control
 
     ContextMenu.menu: TextEditingContextMenu {
-        control: control
+        editor: control
     }
 }
diff --git a/src/quickcontrols/macos/TextField.qml b/src/quickcontrols/macos/TextField.qml
index 70e7be88da..33b268a619 100644
--- a/src/quickcontrols/macos/TextField.qml
+++ b/src/quickcontrols/macos/TextField.qml
@@ -11,6 +11,6 @@ NativeStyle.DefaultTextField {
     readonly property Item __focusFrameTarget: control
 
     ContextMenu.menu: TextEditingContextMenu {
-        control: control
+        editor: control
     }
 }
diff --git a/src/quickcontrols/macos/impl/TextEditingContextMenu.qml b/src/quickcontrols/macos/impl/TextEditingContextMenu.qml
index a06adc3fd5..c7152b8c4c 100644
--- a/src/quickcontrols/macos/impl/TextEditingContextMenu.qml
+++ b/src/quickcontrols/macos/impl/TextEditingContextMenu.qml
@@ -9,24 +9,24 @@ Menu {
     id: menu
     popupType: Popup.Window
 
-    required property var control
+    required property var editor
 
     MacOSImpl.CutAction {
-        control: menu.control
+        editor: menu.editor
     }
     MacOSImpl.CopyAction {
-        control: menu.control
+        editor: menu.editor
     }
     MacOSImpl.PasteAction {
-        control: menu.control
+        editor: menu.editor
     }
     MacOSImpl.DeleteAction {
-        control: menu.control
+        editor: menu.editor
     }
 
     MenuSeparator {}
 
     MacOSImpl.SelectAllAction {
-        control: menu.control
+        editor: menu.editor
     }
 }
diff --git a/src/quickcontrols/material/TextArea.qml b/src/quickcontrols/material/TextArea.qml
index 9ea9c81eeb..2e3ae9991b 100644
--- a/src/quickcontrols/material/TextArea.qml
+++ b/src/quickcontrols/material/TextArea.qml
@@ -40,7 +40,7 @@ T.TextArea {
     Material.containerStyle: Material.Outlined
 
     ContextMenu.menu: TextEditingContextMenu {
-        control: control
+        editor: control
     }
 
     cursorDelegate: CursorDelegate { }
diff --git a/src/quickcontrols/material/TextField.qml b/src/quickcontrols/material/TextField.qml
index b9e1a77aa9..5c227cf510 100644
--- a/src/quickcontrols/material/TextField.qml
+++ b/src/quickcontrols/material/TextField.qml
@@ -40,7 +40,7 @@ T.TextField {
     Material.containerStyle: Material.Outlined
 
     ContextMenu.menu: TextEditingContextMenu {
-        control: control
+        editor: control
     }
 
     cursorDelegate: CursorDelegate { }
diff --git a/src/quickcontrols/material/impl/TextEditingContextMenu.qml b/src/quickcontrols/material/impl/TextEditingContextMenu.qml
index ab5b117780..cba7e52429 100644
--- a/src/quickcontrols/material/impl/TextEditingContextMenu.qml
+++ b/src/quickcontrols/material/impl/TextEditingContextMenu.qml
@@ -9,24 +9,24 @@ Menu {
     id: menu
     popupType: Qt.platform.pluginName !== "wayland" ? Popup.Window : Popup.Item
 
-    required property var control
+    required property var editor
 
     CutAction {
-        control: menu.control
+        editor: menu.editor
     }
     CopyAction {
-        control: menu.control
+        editor: menu.editor
     }
     PasteAction {
-        control: menu.control
+        editor: menu.editor
     }
     DeleteAction {
-        control: menu.control
+        editor: menu.editor
     }
 
     MenuSeparator {}
 
     SelectAllAction {
-        control: menu.control
+        editor: menu.editor
     }
 }
diff --git a/src/quickcontrols/universal/TextArea.qml b/src/quickcontrols/universal/TextArea.qml
index 1b4fca2061..9dd5da9da6 100644
--- a/src/quickcontrols/universal/TextArea.qml
+++ b/src/quickcontrols/universal/TextArea.qml
@@ -34,7 +34,7 @@ T.TextArea {
                                                    Universal.baseMediumColor
 
     ContextMenu.menu: TextEditingContextMenu {
-        control: control
+        editor: control
     }
 
     PlaceholderText {
diff --git a/src/quickcontrols/universal/TextField.qml b/src/quickcontrols/universal/TextField.qml
index 61469decdb..370b42fa4e 100644
--- a/src/quickcontrols/universal/TextField.qml
+++ b/src/quickcontrols/universal/TextField.qml
@@ -34,7 +34,7 @@ T.TextField {
     verticalAlignment: TextInput.AlignVCenter
 
     ContextMenu.menu: TextEditingContextMenu {
-        control: control
+        editor: control
     }
 
     PlaceholderText {
diff --git a/src/quickcontrols/universal/impl/TextEditingContextMenu.qml b/src/quickcontrols/universal/impl/TextEditingContextMenu.qml
index 678551b473..c1b17f49ce 100644
--- a/src/quickcontrols/universal/impl/TextEditingContextMenu.qml
+++ b/src/quickcontrols/universal/impl/TextEditingContextMenu.qml
@@ -9,24 +9,24 @@ Menu {
     id: menu
     popupType: Qt.platform.pluginName !== "wayland" ? Popup.Window : Popup.Item
 
-    required property var control
+    required property var editor
 
     UniversalImpl.CutAction {
-        control: menu.control
+        editor: menu.editor
     }
     UniversalImpl.CopyAction {
-        control: menu.control
+        editor: menu.editor
     }
     UniversalImpl.PasteAction {
-        control: menu.control
+        editor: menu.editor
     }
     UniversalImpl.DeleteAction {
-        control: menu.control
+        editor: menu.editor
     }
 
     MenuSeparator {}
 
     UniversalImpl.SelectAllAction {
-        control: menu.control
+        editor: menu.editor
     }
 }
diff --git a/src/quickcontrols/windows/TextArea.qml b/src/quickcontrols/windows/TextArea.qml
index 7c1f225fb1..06b740fb00 100644
--- a/src/quickcontrols/windows/TextArea.qml
+++ b/src/quickcontrols/windows/TextArea.qml
@@ -10,6 +10,6 @@ NativeStyle.DefaultTextArea {
     id: control
 
     ContextMenu.menu: WindowsImpl.TextEditingContextMenu {
-        control: control
+        editor: control
     }
 }
diff --git a/src/quickcontrols/windows/TextField.qml b/src/quickcontrols/windows/TextField.qml
index b1c752db18..82eb108277 100644
--- a/src/quickcontrols/windows/TextField.qml
+++ b/src/quickcontrols/windows/TextField.qml
@@ -10,6 +10,6 @@ NativeStyle.DefaultTextField {
     id: control
 
     ContextMenu.menu: TextEditingContextMenu {
-        control: control
+        editor: control
     }
 }
diff --git a/src/quickcontrols/windows/impl/TextEditingContextMenu.qml b/src/quickcontrols/windows/impl/TextEditingContextMenu.qml
index 5ddcef24dd..f2b59160af 100644
--- a/src/quickcontrols/windows/impl/TextEditingContextMenu.qml
+++ b/src/quickcontrols/windows/impl/TextEditingContextMenu.qml
@@ -9,24 +9,24 @@ Menu {
     id: menu
     popupType: Popup.Window
 
-    required property var control
+    required property var editor
 
     WindowsImpl.CutAction {
-        control: menu.control
+        editor: menu.editor
     }
     WindowsImpl.CopyAction {
-        control: menu.control
+        editor: menu.editor
     }
     WindowsImpl.PasteAction {
-        control: menu.control
+        editor: menu.editor
     }
     WindowsImpl.DeleteAction {
-        control: menu.control
+        editor: menu.editor
     }
 
     MenuSeparator {}
 
     WindowsImpl.SelectAllAction {
-        control: menu.control
+        editor: menu.editor
     }
 }
diff --git a/src/quickcontrolsimpl/CopyAction.qml b/src/quickcontrolsimpl/CopyAction.qml
index abbefa54ac..d778030965 100644
--- a/src/quickcontrolsimpl/CopyAction.qml
+++ b/src/quickcontrolsimpl/CopyAction.qml
@@ -11,8 +11,8 @@ T.Action {
     icon.width: 24
     icon.height: 24
     shortcut: StandardKey.Copy
-    enabled: control.selectedText.length > 0 && control.hasOwnProperty("copy")
-    onTriggered: control.copy()
+    enabled: editor.selectedText.length > 0 && editor.hasOwnProperty("copy")
+    onTriggered: editor.copy()
 
-    required property var control
+    required property var editor
 }
diff --git a/src/quickcontrolsimpl/CutAction.qml b/src/quickcontrolsimpl/CutAction.qml
index 150be1e9b9..528260823f 100644
--- a/src/quickcontrolsimpl/CutAction.qml
+++ b/src/quickcontrolsimpl/CutAction.qml
@@ -16,10 +16,10 @@ T.Action {
     // duplicate actions (at least when QT_NO_SHORTCUT is not defined).
     shortcut: StandardKey.Cut
     // If the control has no cut property, Qt was built without clipboard support.
-    enabled: !control.readOnly && control.selectedText.length > 0 && control.hasOwnProperty("cut")
-    onTriggered: control.cut()
+    enabled: !editor.readOnly && editor.selectedText.length > 0 && editor.hasOwnProperty("cut")
+    onTriggered: editor.cut()
 
     // Can't be T.Control because otherwise it would fail to assign TextField/TextArea to it,
     // and we'd need TextFieldCutAction and TextAreaCutAction.
-    required property var control
+    required property var editor
 }
diff --git a/src/quickcontrolsimpl/DeleteAction.qml b/src/quickcontrolsimpl/DeleteAction.qml
index 0beb878fc0..7eaf3bba64 100644
--- a/src/quickcontrolsimpl/DeleteAction.qml
+++ b/src/quickcontrolsimpl/DeleteAction.qml
@@ -11,8 +11,8 @@ T.Action {
     icon.width: 24
     icon.height: 24
     shortcut: StandardKey.Delete
-    enabled: !control.readOnly && control.selectedText.length > 0
-    onTriggered: control.remove(control.selectionStart, control.selectionEnd)
+    enabled: !editor.readOnly && editor.selectedText.length > 0
+    onTriggered: editor.remove(editor.selectionStart, editor.selectionEnd)
 
-    required property var control
+    required property var editor
 }
diff --git a/src/quickcontrolsimpl/PasteAction.qml b/src/quickcontrolsimpl/PasteAction.qml
index 89e2d02271..be11264a7d 100644
--- a/src/quickcontrolsimpl/PasteAction.qml
+++ b/src/quickcontrolsimpl/PasteAction.qml
@@ -11,8 +11,8 @@ T.Action {
     icon.width: 24
     icon.height: 24
     shortcut: StandardKey.Paste
-    enabled: !control.readOnly && control.hasOwnProperty("paste")
-    onTriggered: control.paste()
+    enabled: !editor.readOnly && editor.hasOwnProperty("paste")
+    onTriggered: editor.paste()
 
-    required property var control
+    required property var editor
 }
diff --git a/src/quickcontrolsimpl/SelectAllAction.qml b/src/quickcontrolsimpl/SelectAllAction.qml
index db94d5af8a..41c741971e 100644
--- a/src/quickcontrolsimpl/SelectAllAction.qml
+++ b/src/quickcontrolsimpl/SelectAllAction.qml
@@ -11,7 +11,7 @@ T.Action {
     icon.width: 24
     icon.height: 24
     shortcut: StandardKey.SelectAll
-    onTriggered: control.selectAll()
+    onTriggered: editor.selectAll()
 
-    required property var control
+    required property var editor
 }