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

Change-Id: I62205e6f9636270cbc0a39b8c5e2cd61c605f39f

1 files changed, 28 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()
+    }
 }