From 80968e5e6ca6ce95fefe25721768ce4471a97c7a Mon Sep 17 00:00:00 2001
From: Jan Arve Saether <jan-arve.saether@digia.com>
Date: Mon, 8 Apr 2013 17:06:10 +0200
Subject: [PATCH] Change some "Layout.Expanding" members to fill{Width|Height}
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Seems like these were forgotten back when the change was done.
Change-Id: I73fed91ccdbeac96164513c51a7b9b3ee66efcfa
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
---
tests/manual/Layout.qml | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/tests/manual/Layout.qml b/tests/manual/Layout.qml
index 2b4bd2004..8f2cceddf 100644
--- a/tests/manual/Layout.qml
+++ b/tests/manual/Layout.qml
@@ -729,8 +729,8 @@ Item {
color: "green"
width: 20
height: 20
- Layout.horizontalSizePolicy: Layout.Expanding
- Layout.verticalSizePolicy: Layout.Expanding
+ Layout.fillWidth: true
+ Layout.fillHeight: true
}
Rectangle {
color: "green"
@@ -740,8 +740,8 @@ Item {
Layout.column: 1
Layout.rowSpan: 2
Layout.columnSpan: 2
- Layout.horizontalSizePolicy: Layout.Expanding
- Layout.verticalSizePolicy: Layout.Expanding
+ Layout.fillWidth: true
+ Layout.fillHeight: true
}
Rectangle {
color: "green"
@@ -749,16 +749,16 @@ Item {
height: 20
Layout.row: 0
Layout.column: 1
- Layout.horizontalSizePolicy: Layout.Expanding
- Layout.verticalSizePolicy: Layout.Expanding
+ Layout.fillWidth: true
+ Layout.fillHeight: true
}
Rectangle {
color: "green"
width: 20
height: 20
Layout.rowSpan: 2
- Layout.horizontalSizePolicy: Layout.Expanding
- Layout.verticalSizePolicy: Layout.Expanding
+ Layout.fillWidth: true
+ Layout.fillHeight: true
}
Repeater {
model: 10
@@ -766,8 +766,8 @@ Item {
color: Qt.rgba(1, 0, 0, 1 - (index/10.0))
width: 20
height: 20
- Layout.horizontalSizePolicy: Layout.Expanding
- Layout.verticalSizePolicy: Layout.Expanding
+ Layout.fillWidth: true
+ Layout.fillHeight: true
Text { text: index }
}
}
@@ -776,8 +776,8 @@ Item {
width: 20
Layout.columnSpan:2
height: 20
- Layout.horizontalSizePolicy: Layout.Expanding
- Layout.verticalSizePolicy: Layout.Expanding
+ Layout.fillWidth: true
+ Layout.fillHeight: true
}
}
}
--
GitLab