diff options
author | David Boddie <dboddie@trolltech.com> | 2010-07-12 12:35:27 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-07-12 12:35:27 (GMT) |
commit | 55ff179342bfb67b6f2592d7b1df66e1f3c6a350 (patch) | |
tree | 266b6e82ae4de9c1eb2f0c2d2c2310f774a55089 /examples/declarative/ui-components/tabwidget/main.qml | |
parent | 0713442baa4120050e85c13998797415bb40efce (diff) | |
parent | e4f5a81869e75a998278c19134f2772fefd998fe (diff) | |
download | Qt-55ff179342bfb67b6f2592d7b1df66e1f3c6a350.zip Qt-55ff179342bfb67b6f2592d7b1df66e1f3c6a350.tar.gz Qt-55ff179342bfb67b6f2592d7b1df66e1f3c6a350.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'examples/declarative/ui-components/tabwidget/main.qml')
-rw-r--r-- | examples/declarative/ui-components/tabwidget/main.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/declarative/ui-components/tabwidget/main.qml b/examples/declarative/ui-components/tabwidget/main.qml index e11902a..4a27806 100644 --- a/examples/declarative/ui-components/tabwidget/main.qml +++ b/examples/declarative/ui-components/tabwidget/main.qml @@ -50,7 +50,7 @@ TabWidget { color: "#e3e3e3" Rectangle { - anchors { fill: parent; topMargin: 20; leftMargin: 20; rightMargin: 20; bottomMargin: 20 } + anchors.fill: parent; anchors.margins: 20 color: "#ff7f7f" Text { width: parent.width - 20 @@ -68,7 +68,7 @@ TabWidget { color: "#e3e3e3" Rectangle { - anchors { fill: parent; topMargin: 20; leftMargin: 20; rightMargin: 20; bottomMargin: 20 } + anchors.fill: parent; anchors.margins: 20 color: "#7fff7f" Text { width: parent.width - 20 @@ -85,7 +85,7 @@ TabWidget { anchors.fill: parent; color: "#e3e3e3" Rectangle { - anchors { fill: parent; topMargin: 20; leftMargin: 20; rightMargin: 20; bottomMargin: 20 } + anchors.fill: parent; anchors.margins: 20 color: "#7f7fff" Text { width: parent.width - 20 |