Fix style inheritance with dynamically changing windows

It can happen that the parent item changes before an item gets
associated with a window.

Change-Id: I4cb65a06d363f8211b202e559c76793c71ba318a
Reviewed-by: Nikita Krupenko <krnekit@gmail.com>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

2 files changed, 39 insertions, 0 deletions

diff --git a/tests/auto/material/data/tst_material.qml b/tests/auto/material/data/tst_material.qml
index 25b4ec98..2e7390c2 100644
--- a/tests/auto/material/data/tst_material.qml
+++ b/tests/auto/material/data/tst_material.qml
@@ -426,6 +426,25 @@ TestCase {
         window.destroy()
     }
 
+    function test_windowChange() {
+        var ldr = loader.createObject()
+        verify(ldr)
+
+        var wnd = window.createObject()
+        verify(wnd)
+
+        wnd.Material.theme = Material.Dark
+        compare(wnd.Material.theme, Material.Dark)
+
+        ldr.active = true
+        verify(ldr.item)
+        compare(ldr.item.Material.theme, Material.Light)
+
+        ldr.parent = wnd.contentItem
+        compare(ldr.item.Material.theme, Material.Dark)
+
+        wnd.destroy()
+    }
 
     function test_colors_data() {
         return [
diff --git a/tests/auto/universal/data/tst_universal.qml b/tests/auto/universal/data/tst_universal.qml
index a88f2c49..0bc0d09d 100644
--- a/tests/auto/universal/data/tst_universal.qml
+++ b/tests/auto/universal/data/tst_universal.qml
@@ -318,6 +318,26 @@ TestCase {
         window.destroy()
     }
 
+    function test_windowChange() {
+        var ldr = loader.createObject()
+        verify(ldr)
+
+        var wnd = window.createObject()
+        verify(wnd)
+
+        wnd.Universal.theme = Universal.Dark
+        compare(wnd.Universal.theme, Universal.Dark)
+
+        ldr.active = true
+        verify(ldr.item)
+        compare(ldr.item.Universal.theme, Universal.Light)
+
+        ldr.parent = wnd.contentItem
+        compare(ldr.item.Universal.theme, Universal.Dark)
+
+        wnd.destroy()
+    }
+
     function test_colors_data() {
         return [
             { tag: "accent" }, { tag: "background" }, { tag: "foreground" }