summaryrefslogtreecommitdiffstats
path: root/basicsuite/Controls Layouts
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@digia.com>2013-06-04 11:53:38 +0200
committerGunnar Sletta <gunnar.sletta@digia.com>2013-06-04 13:09:09 +0300
commit5aa53579156a5234a660999c876f17339542113a (patch)
tree8228a4b742da524ee33ba37ddea116181a87c64f /basicsuite/Controls Layouts
parent1fd1f0d7c0906be8960ce6a7b9246d9e594af806 (diff)
Update controls to work with latest API
Change-Id: Ib2d71f1b81aa5d4befbf8f61dbfbb0f92ddc00fa Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'basicsuite/Controls Layouts')
-rw-r--r--basicsuite/Controls Layouts/main.qml8
1 files changed, 1 insertions, 7 deletions
diff --git a/basicsuite/Controls Layouts/main.qml b/basicsuite/Controls Layouts/main.qml
index 7ed3323..b12b6c8 100644
--- a/basicsuite/Controls Layouts/main.qml
+++ b/basicsuite/Controls Layouts/main.qml
@@ -54,7 +54,6 @@ Rectangle {
}
property int margin: 11
-
width: 1280
height: 720
@@ -65,8 +64,6 @@ Rectangle {
GroupBox {
id: rowBox
title: "Row layout"
- contentWidth: rowLayout.implicitWidth
- contentHeight: rowLayout.implicitHeight
Layout.fillWidth: true
RowLayout {
@@ -85,8 +82,6 @@ Rectangle {
GroupBox {
id: gridBox
title: "Grid layout"
- contentWidth: gridLayout.implicitWidth
- contentHeight: gridLayout.implicitHeight
Layout.fillWidth: true
GridLayout {
@@ -115,8 +110,7 @@ Rectangle {
TextArea {
id: t3
text: "This fills the whole cell"
- width: 200
- height: 400
+ Layout.minimumHeight: 30
Layout.fillHeight: true
Layout.fillWidth: true
}