diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-25 11:02:44 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-25 11:03:53 +0100 |
| commit | 5ada1525e03116326a480fb05611904d3484c296 (patch) | |
| tree | f23822e6b0482012065b9586d95cb8ab5d70c4bf /tests/manual | |
| parent | f4f5e857447d42738b1b60b5c4184f39df2f1593 (diff) | |
| parent | 4f1fb09ed70c69e73f2e19f28f4299f4cfbc90dc (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.gitignore
src/templates/qquickcombobox_p.h
src/templates/qquickmenu_p.h
src/templates/qquickmenu_p_p.h
src/templates/qquickoverlay_p.h
src/templates/qquickpopup.cpp
src/templates/qquickpopup_p.h
src/templates/qquickstackview_p.cpp
Change-Id: I89c7d518697beec0b81ef3a12205286a4f3ccf89
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/testbench/main.qml | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml index 76008497..6ace3620 100644 --- a/tests/manual/testbench/main.qml +++ b/tests/manual/testbench/main.qml @@ -53,7 +53,6 @@ ApplicationWindow { Material.theme: themeSwitch.checked ? Material.Dark : Material.Light Universal.theme: themeSwitch.checked ? Universal.Dark : Universal.Light - Material.accent: Material.LightGreen property int controlSpacing: 10 @@ -71,6 +70,25 @@ ApplicationWindow { ToolButton { text: "Normal" onClicked: menu.visible ? menu.close() : menu.open() + + Menu { + id: menu + x: 1 + y: 1 + parent.height + + MenuItem { + text: "Option 1" + checkable: true + } + MenuItem { + text: "Option 2" + checkable: true + } + MenuItem { + text: "Option 3" + checkable: true + } + } } ToolButton { text: "Pressed" @@ -115,25 +133,6 @@ ApplicationWindow { } } - Menu { - id: menu - contentItem.x: 1 - contentItem.y: header.height - - MenuItem { - text: "Option 1" - checkable: true - } - MenuItem { - text: "Option 2" - checkable: true - } - MenuItem { - text: "Option 3" - checkable: true - } - } - Pane { anchors.fill: parent |