diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2025-09-16 14:11:03 +0800 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2025-11-12 17:32:49 +0800 |
| commit | dacf15cbb0241bb91915cfd4a39f35ae72de9adc (patch) | |
| tree | add8f138ef4d27f7e544c89696e14b6292a385e1 /src/quickcontrols/windows | |
| parent | b474514720ff56d4b2df486a9fd61045630f251a (diff) | |
Context menus: rename control to editor
This better reflects what it is and avoids naming conflicts with the
controls themselves.
Pick down to 6.9 (where QQuickContextMenu was introduced) to avoid
future cherry-pick conflicts.
Task-number: QTBUG-133556
Task-number: QTBUG-134903
Pick-to: 6.9 6.10
Change-Id: If0af26c5f16ee56cc909fcc66d1421109786343e
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Diffstat (limited to 'src/quickcontrols/windows')
| -rw-r--r-- | src/quickcontrols/windows/TextArea.qml | 2 | ||||
| -rw-r--r-- | src/quickcontrols/windows/TextField.qml | 2 | ||||
| -rw-r--r-- | src/quickcontrols/windows/impl/TextEditingContextMenu.qml | 12 |
3 files changed, 8 insertions, 8 deletions
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 } } |