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

Change-Id: Ifb2d12d09994f3970b117ee76522c7d9c7152587

1 files changed, 47 insertions, 0 deletions

diff --git a/tests/auto/material/data/tst_material.qml b/tests/auto/material/data/tst_material.qml
index 439bee59..25b4ec98 100644
--- a/tests/auto/material/data/tst_material.qml
+++ b/tests/auto/material/data/tst_material.qml
@@ -115,6 +115,26 @@ TestCase {
     }
 
     Component {
+        id: popupComponent
+        ApplicationWindow {
+            Material.primary: Material.Blue
+            Material.accent: Material.Red
+            visible: true
+            property alias popup: popupInstance
+            property alias label: labelInstance
+            Popup {
+                id: popupInstance
+                Label {
+                    id: labelInstance
+                    text: "test"
+                    color: popupInstance.Material.textSelectionColor
+                }
+                Component.onCompleted: open()
+            }
+        }
+    }
+
+    Component {
         id: comboBox
         ApplicationWindow {
             width: 200
@@ -245,6 +265,33 @@ TestCase {
         parent.destroy()
     }
 
+    function test_inheritance_popup_data() {
+        return [
+            { tag: "primary", value1: Material.color(Material.Amber), value2: Material.color(Material.Indigo) },
+            { tag: "accent", value1: Material.color(Material.Amber), value2: Material.color(Material.Indigo) },
+            { tag: "theme", value1: Material.Dark, value2: Material.Light },
+        ]
+    }
+
+    function test_inheritance_popup(data) {
+        var prop = data.tag
+        var popupObject = popupComponent.createObject(testCase)
+        compare(popupObject.popup.Material.textSelectionColor.toString(), popupObject.Material.textSelectionColor.toString())
+        compare(popupObject.label.color.toString(), popupObject.Material.textSelectionColor.toString())
+
+        popupObject.Material[prop] = data.value1
+        compare(popupObject.Material[prop], data.value1)
+        compare(popupObject.popup.Material.textSelectionColor.toString(), popupObject.Material.textSelectionColor.toString())
+        compare(popupObject.label.color.toString(), popupObject.Material.textSelectionColor.toString())
+
+        popupObject.Material[prop] = data.value2
+        compare(popupObject.Material[prop], data.value2)
+        compare(popupObject.popup.Material.textSelectionColor.toString(), popupObject.Material.textSelectionColor.toString())
+        compare(popupObject.label.color.toString(), popupObject.Material.textSelectionColor.toString())
+
+        popupObject.destroy()
+    }
+
     function test_window() {
         var parent = window.createObject()