From 93a79811137172275ab87fbfc61355f56da07397 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 7 Jan 2016 17:31:16 +0100 Subject: tst_combobox: set size for the test case Should help with the warning that sometimes appears in the CI: QWARN : tst_styles(material)::UnknownTestFunc() QWindowsWindow::setGeometry: Unable to set geometry 0x0+66+112 on QQuickView/'tst_combobox'. Resulting geometry: 124x0+66+112 (frame: 8, 31, 8, 8, custom margin: 0, 0, 0, 0, minimum size: 0x0, maximum size: 16777215x16777215). Change-Id: I913ae09dfad4d1ef914ed589466ede6d62bece79 Reviewed-by: J-P Nurmi --- tests/auto/controls/data/tst_combobox.qml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests') diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index 11390bb8..d74c52aa 100644 --- a/tests/auto/controls/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -44,6 +44,8 @@ import Qt.labs.controls 1.0 TestCase { id: testCase + width: 200 + height: 200 name: "ComboBox" ApplicationWindow { -- cgit v1.2.3 From 476f7944d24657055db6384f11eacf7589687f76 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 8 Jan 2016 16:47:14 +0100 Subject: Don't skip test_indeterminate now that the bug is fixed Change-Id: If8810ae39fbfefdbf381a5fdefb25974f1f3925c Reviewed-by: J-P Nurmi --- tests/auto/controls/data/tst_progressbar.qml | 1 - 1 file changed, 1 deletion(-) (limited to 'tests') diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml index 086d9ad4..1aea09f5 100644 --- a/tests/auto/controls/data/tst_progressbar.qml +++ b/tests/auto/controls/data/tst_progressbar.qml @@ -183,7 +183,6 @@ TestCase { } function test_indeterminate() { - skip("skipping until https://codereview.qt-project.org/#/c/145140/ is merged") var control = progressBar.createObject(testCase) verify(control) compare(control.indeterminate, false) -- cgit v1.2.3 From a3dddf0471452448003cfe6c6802e3ccaf565b5d Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 7 Jan 2016 15:52:08 +0100 Subject: Fix style inheritance for popups Change-Id: I7bc36cb68e8d668fff2270e018de7eb1c71ccd20 Task-number: QTBUG-50347 Reviewed-by: Mitch Curtis --- tests/auto/material/data/tst_material.qml | 28 ++++++++++++++++++++++++++++ tests/auto/universal/data/tst_universal.qml | 28 ++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) (limited to 'tests') 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) -- cgit v1.2.3