SplitView: fix preferredHeight not being restored in restoreState()

Change-Id: Icc236494f5df382d6bc49092d23a460822c835a1
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
 

1 files changed, 13 insertions, 5 deletions

diff --git a/tests/auto/controls/data/tst_splitview.qml b/tests/auto/controls/data/tst_splitview.qml
index 55592eee..a03c09a0 100644
--- a/tests/auto/controls/data/tst_splitview.qml
+++ b/tests/auto/controls/data/tst_splitview.qml
@@ -1851,13 +1851,21 @@ TestCase {
         }
     }
 
-    function test_saveAndRestoreState() {
-        var control = createTemporaryObject(threeSizedItemsComponent, testCase)
+    function test_saveAndRestoreState_data() {
+        return [
+            { tag: "Horizontal", orientation: Qt.Horizontal, propertyName: "preferredWidth", propertyValue: 123 },
+            { tag: "Vertical", orientation: Qt.Vertical, propertyName: "preferredHeight", propertyValue: 234 }
+        ]
+    }
+
+    function test_saveAndRestoreState(data) {
+        var control = createTemporaryObject(threeSizedItemsComponent, testCase, { orientation: data.orientation })
         verify(control)
+        compare(control.orientation, data.orientation)
 
         var lastItem = control.itemAt(2)
         verify(lastItem)
-        lastItem.SplitView.preferredWidth = 123
+        lastItem.SplitView[data.propertyName] = data.propertyValue
 
         // Save the state.
         var settings = createTemporaryObject(settingsComponent, testCase)
@@ -1868,14 +1876,14 @@ TestCase {
         control = createTemporaryObject(threeSizedItemsComponent, testCase)
         lastItem = control.itemAt(2)
         verify(lastItem)
-        compare(lastItem.SplitView.preferredWidth, -1)
+        compare(lastItem.SplitView[data.propertyName], -1)
 
         settings = createTemporaryObject(settingsComponent, testCase)
         verify(settings)
 
         // Restore the state.
         control.restoreState(settings.value("splitView"))
-        compare(lastItem.SplitView.preferredWidth, 123)
+        compare(lastItem.SplitView[data.propertyName], data.propertyValue)
     }
 
     function test_changePreferredSizeDuringLayout() {