Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: I62205e6f9636270cbc0a39b8c5e2cd61c605f39f

4 files changed, 58 insertions, 1 deletions

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 {
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)
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)