diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2019-04-29 13:03:25 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2019-05-03 11:28:23 +0000 |
| commit | 7f1d0976d3ac0c6226bef1947a4eafd44b60e5e9 (patch) | |
| tree | c1f1feaa527cf6c9e976450a2ae3212e3f189dba /tests/auto/qquickmenu/data | |
| parent | 51f6c17ff2b5b6ce23d115e1871fea7d8350a049 (diff) | |
Make tst_qquickmenu run with all styles
This is a prerequisite for ensuring that an Imagine-style-specific fix
works.
Fixes: QTBUG-75141
Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'tests/auto/qquickmenu/data')
| -rw-r--r-- | tests/auto/qquickmenu/data/popup.qml | 2 | ||||
| -rw-r--r-- | tests/auto/qquickmenu/data/subMenus.qml | 60 |
2 files changed, 52 insertions, 10 deletions
diff --git a/tests/auto/qquickmenu/data/popup.qml b/tests/auto/qquickmenu/data/popup.qml index e044a527..3272cd6f 100644 --- a/tests/auto/qquickmenu/data/popup.qml +++ b/tests/auto/qquickmenu/data/popup.qml @@ -53,7 +53,7 @@ import QtQuick.Controls 2.12 ApplicationWindow { width: 400 - height: 400 + height: 600 property alias menu: menu property alias menuItem1: menuItem1 diff --git a/tests/auto/qquickmenu/data/subMenus.qml b/tests/auto/qquickmenu/data/subMenus.qml index 413e442d..4952e7a1 100644 --- a/tests/auto/qquickmenu/data/subMenus.qml +++ b/tests/auto/qquickmenu/data/subMenus.qml @@ -62,31 +62,73 @@ ApplicationWindow { Menu { id: mainMenu - MenuItem { id: mainMenuItem1; text: "Main 1" } + MenuItem { + id: mainMenuItem1 + objectName: "mainMenuItem1" + text: "Main 1" + } Menu { id: subMenu1 + objectName: "subMenu1" title: "Sub Menu 1" - MenuItem { id: subMenuItem1; text: "Sub 1" } - MenuItem { id: subMenuItem2; text: "Sub 2" } + + MenuItem { + id: subMenuItem1 + objectName: "subMenuItem1" + text: "Sub 1" + } + MenuItem { + id: subMenuItem2 + objectName: "subMenuItem2" + text: "Sub 2" + } Menu { id: subSubMenu1 + objectName: "subSubMenu1" title: "Sub Sub Menu 1" - MenuItem { id: subSubMenuItem1; text: "Sub Sub 1" } - MenuItem { id: subSubMenuItem2; text: "Sub Sub 2" } + + MenuItem { + id: subSubMenuItem1 + objectName: "subSubMenuItem1" + text: "Sub Sub 1" + } + MenuItem { + id: subSubMenuItem2 + objectName: "subSubMenuItem2" + text: "Sub Sub 2" + } } } - MenuItem { id: mainMenuItem2; text: "Main 2" } + MenuItem { + id: mainMenuItem2 + objectName: "mainMenuItem2" + text: "Main 2" + } Menu { id: subMenu2 + objectName: "subMenu2" title: "Sub Menu 2" - MenuItem { id: subMenuItem3; text: "Sub 3" } - MenuItem { id: subMenuItem4; text: "Sub 4" } + + MenuItem { + id: subMenuItem3 + objectName: "subMenuItem3" + text: "Sub 3" + } + MenuItem { + id: subMenuItem4 + objectName: "subMenuItem4" + text: "Sub 4" + } } - MenuItem { id: mainMenuItem3; text: "Main 3" } + MenuItem { + id: mainMenuItem3 + objectName: "mainMenuItem3" + text: "Main 3" + } } } |