diff options
| author | Frederic Lefebvre <frederic.lefebvre@qt.io> | 2025-10-29 14:12:39 +0100 |
|---|---|---|
| committer | Frederic Lefebvre <frederic.lefebvre@qt.io> | 2025-10-31 07:48:08 +0000 |
| commit | 65e39a210ce4dc5bd61a490cd1bc6b17cbf706c4 (patch) | |
| tree | e0314e056bde39984dcbebf415260d4b066d536e | |
| parent | 1b0e5474c0297e8151029952c379ad94cb91dd76 (diff) | |
Change PopupType of textEditingContextMenu for Popup.Item on Wayland
Use Popup.Item popupType when test is run on Wayland.
Remove the need for a transient parent on Wayland that was
causing several tests of tst_QQuickTextField to consistently fail.
Fix the following failing tests on Ubuntu 24.04 wayland
tst_QQuickTextField::contextMenuCopy, contextMenuCut,
contextMenuDelete, contextMenuPaste, contextMenySelectAll,
releaseAfterPressAndHold, touchscreenDoesNotSelect.
Pick-to: 6.10
Change-Id: I5a411dae63ae36361ed83055a1eb4c87de17acae
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
6 files changed, 6 insertions, 6 deletions
diff --git a/src/quickcontrols/basic/impl/TextEditingContextMenu.qml b/src/quickcontrols/basic/impl/TextEditingContextMenu.qml index ab00553ee0..3cd5027f9e 100644 --- a/src/quickcontrols/basic/impl/TextEditingContextMenu.qml +++ b/src/quickcontrols/basic/impl/TextEditingContextMenu.qml @@ -7,7 +7,7 @@ import QtQuick.Controls.impl Menu { id: menu - popupType: Popup.Window + popupType: Qt.platform.pluginName !== "wayland" ? Popup.Window : Popup.Item required property var control diff --git a/src/quickcontrols/fluentwinui3/impl/TextEditingContextMenu.qml b/src/quickcontrols/fluentwinui3/impl/TextEditingContextMenu.qml index c158166d8e..6eaa998873 100644 --- a/src/quickcontrols/fluentwinui3/impl/TextEditingContextMenu.qml +++ b/src/quickcontrols/fluentwinui3/impl/TextEditingContextMenu.qml @@ -7,7 +7,7 @@ import QtQuick.Controls.FluentWinUI3.impl as FluentWinUI3Impl Menu { id: menu - popupType: Popup.Window + popupType: Qt.platform.pluginName !== "wayland" ? Popup.Window : Popup.Item required property var control diff --git a/src/quickcontrols/fusion/impl/TextEditingContextMenu.qml b/src/quickcontrols/fusion/impl/TextEditingContextMenu.qml index 17b9b2df43..b55c5a5a1a 100644 --- a/src/quickcontrols/fusion/impl/TextEditingContextMenu.qml +++ b/src/quickcontrols/fusion/impl/TextEditingContextMenu.qml @@ -7,7 +7,7 @@ import QtQuick.Controls.Fusion.impl as FusionImpl Menu { id: menu - popupType: Popup.Window + popupType: Qt.platform.pluginName !== "wayland" ? Popup.Window : Popup.Item required property var control diff --git a/src/quickcontrols/imagine/impl/TextEditingContextMenu.qml b/src/quickcontrols/imagine/impl/TextEditingContextMenu.qml index a95e1b8614..8065477200 100644 --- a/src/quickcontrols/imagine/impl/TextEditingContextMenu.qml +++ b/src/quickcontrols/imagine/impl/TextEditingContextMenu.qml @@ -7,7 +7,7 @@ import QtQuick.Controls.Imagine Menu { id: menu - popupType: Popup.Window + popupType: Qt.platform.pluginName !== "wayland" ? Popup.Window : Popup.Item required property var control diff --git a/src/quickcontrols/material/impl/TextEditingContextMenu.qml b/src/quickcontrols/material/impl/TextEditingContextMenu.qml index 1585606896..ab5b117780 100644 --- a/src/quickcontrols/material/impl/TextEditingContextMenu.qml +++ b/src/quickcontrols/material/impl/TextEditingContextMenu.qml @@ -7,7 +7,7 @@ import QtQuick.Controls.Material Menu { id: menu - popupType: Popup.Window + popupType: Qt.platform.pluginName !== "wayland" ? Popup.Window : Popup.Item required property var control diff --git a/src/quickcontrols/universal/impl/TextEditingContextMenu.qml b/src/quickcontrols/universal/impl/TextEditingContextMenu.qml index 1159c139f3..678551b473 100644 --- a/src/quickcontrols/universal/impl/TextEditingContextMenu.qml +++ b/src/quickcontrols/universal/impl/TextEditingContextMenu.qml @@ -7,7 +7,7 @@ import QtQuick.Controls.Universal.impl as UniversalImpl Menu { id: menu - popupType: Popup.Window + popupType: Qt.platform.pluginName !== "wayland" ? Popup.Window : Popup.Item required property var control |