diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-07 15:52:08 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-08 16:55:51 +0000 |
| commit | a3dddf0471452448003cfe6c6802e3ccaf565b5d (patch) | |
| tree | fb570cfabaa581a6446def56169281cb6beb9a43 /tests | |
| parent | 476f7944d24657055db6384f11eacf7589687f76 (diff) | |
Fix style inheritance for popups
Change-Id: I7bc36cb68e8d668fff2270e018de7eb1c71ccd20
Task-number: QTBUG-50347
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/material/data/tst_material.qml | 28 | ||||
| -rw-r--r-- | tests/auto/universal/data/tst_universal.qml | 28 |
2 files changed, 56 insertions, 0 deletions
diff --git a/tests/auto/material/data/tst_material.qml b/tests/auto/material/data/tst_material.qml index 7797b8c3..5fc52f10 100644 --- a/tests/auto/material/data/tst_material.qml +++ b/tests/auto/material/data/tst_material.qml @@ -94,6 +94,19 @@ TestCase { } } + Component { + id: menu + Item { + Material.accent: Material.Red + property alias menu: popup + Menu { + id: popup + Material.theme: Material.Dark + MenuItem { } + } + } + } + function test_defaults() { var control = button.createObject(testCase) verify(control) @@ -222,4 +235,19 @@ TestCase { compare(child.Material.theme, Material.Dark) control.destroy() } + + function test_menu() { + var container = menu.createObject(testCase) + verify(container) + verify(container.menu) + var child = container.menu.itemAt(0) + verify(child) + compare(container.Material.theme, Material.Light) + compare(container.menu.Material.theme, Material.Dark) + compare(child.Material.theme, Material.Dark) + compare(container.Material.accent, Material.Red) + compare(container.menu.Material.accent, Material.Red) + compare(child.Material.accent, Material.Red) + container.destroy() + } } diff --git a/tests/auto/universal/data/tst_universal.qml b/tests/auto/universal/data/tst_universal.qml index 5c29f33c..6e70f011 100644 --- a/tests/auto/universal/data/tst_universal.qml +++ b/tests/auto/universal/data/tst_universal.qml @@ -94,6 +94,19 @@ TestCase { } } + Component { + id: menu + Item { + Universal.accent: Universal.Red + property alias menu: popup + Menu { + id: popup + Universal.theme: Universal.Dark + MenuItem { } + } + } + } + function test_defaults() { var control = button.createObject(testCase) verify(control) @@ -223,6 +236,21 @@ TestCase { control.destroy() } + function test_menu() { + var container = menu.createObject(testCase) + verify(container) + verify(container.menu) + var child = container.menu.itemAt(0) + verify(child) + compare(container.Universal.theme, Universal.Light) + compare(container.menu.Universal.theme, Universal.Dark) + compare(child.Universal.theme, Universal.Dark) + compare(container.Universal.accent, "#e51400") // Red + compare(container.menu.Universal.accent, "#e51400") // Red + compare(child.Universal.accent, "#e51400") // Red + container.destroy() + } + function test_colors() { var control = button.createObject(testCase) verify(control) |