diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-13 05:46:41 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-13 05:46:41 (GMT) |
| commit | 2fefb455e7a57f320b043bc4eeab7788a07e3779 (patch) | |
| tree | 61ad8632d22cb79ec9c6cce3ca37e9fbdf7270b4 /demos/declarative/calculator/calculator.qml | |
| parent | 9c93d9937ec14d7e00f23827a567a001878a2aab (diff) | |
| parent | 89a54d6b853512398eb1622eba8f6fbc8794277b (diff) | |
| download | Qt-2fefb455e7a57f320b043bc4eeab7788a07e3779.zip Qt-2fefb455e7a57f320b043bc4eeab7788a07e3779.tar.gz Qt-2fefb455e7a57f320b043bc4eeab7788a07e3779.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos/declarative/calculator/calculator.qml')
| -rw-r--r-- | demos/declarative/calculator/calculator.qml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml index a4e16e4..42e1422 100644 --- a/demos/declarative/calculator/calculator.qml +++ b/demos/declarative/calculator/calculator.qml @@ -7,7 +7,7 @@ Rect { Palette { id: Palette } Script { source: "calculator.js" } - VerticalLayout { + VerticalPositioner { x: 2; spacing: 10; margin: 2 Rect { @@ -56,7 +56,7 @@ Rect { CalcButton { operation: "C"; id: C; width: 76 } CalcButton { operation: "AC"; id: AC; x: 78; width: 76 } - GridLayout { + GridPositioner { id: NumKeypad; y: 32; spacing: 2; columns: 3 CalcButton { operation: "7" } @@ -70,7 +70,7 @@ Rect { CalcButton { operation: "3" } } - HorizontalLayout { + HorizontalPositioner { y: 128; spacing: 2 CalcButton { operation: "0"; width: 50 } @@ -78,7 +78,7 @@ Rect { CalcButton { operation: "="; id: Equals; x: 77; width: 102 } } - VerticalLayout { + VerticalPositioner { id: SimpleOperations x: 156; y: 0; spacing: 2 @@ -89,7 +89,7 @@ Rect { } } - GridLayout { + GridPositioner { id: AdvancedButtons x: 350; spacing: 2; columns: 2; opacity: 0 |