diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-09-03 02:29:04 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-09-03 02:29:04 (GMT) |
| commit | c7f516b14aaffaadfdcfd31feded7119be6bf1ec (patch) | |
| tree | 4e887bf686a961ee1c9588d4874e158085171406 /examples | |
| parent | 9a8a4697928e1585b7bedf0681e70e71d955517f (diff) | |
| parent | 0a73357d3851b4eb20483a05f434455f96ded10b (diff) | |
| download | Qt-c7f516b14aaffaadfdcfd31feded7119be6bf1ec.zip Qt-c7f516b14aaffaadfdcfd31feded7119be6bf1ec.tar.gz Qt-c7f516b14aaffaadfdcfd31feded7119be6bf1ec.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/flowview/flowview.qml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/declarative/flowview/flowview.qml b/examples/declarative/flowview/flowview.qml index ca31bcc..1ab8e92 100644 --- a/examples/declarative/flowview/flowview.qml +++ b/examples/declarative/flowview/flowview.qml @@ -15,7 +15,7 @@ Rectangle { states: State { name: "rotated" - PropertyChanges { target: ListView; z: 2 } + PropertyChanges { target: MyListView; z: 2 } PropertyChanges { target: TopBar; y: -30 } PropertyChanges { target: BottomBar; y: 480 } PropertyChanges { target: LeftBar; x: 0 } @@ -44,7 +44,7 @@ Rectangle { } delegate: Package { Item { id: List; Package.name: "list"; width:120; height: 400; } - Item { id: Grid; Package.name: "grid"; width:400; height: 120; } + Item { id: GridItem; Package.name: "grid"; width:400; height: 120; } Loader { id: MyContent; width:400; height: 120; source: weblet } StateGroup { @@ -58,7 +58,7 @@ Rectangle { State { name: "InGrid" when: MyPhone.state != "rotated" - ParentChange { target: MyContent; parent: Grid } + ParentChange { target: MyContent; parent: GridItem } PropertyChanges { target: MyContent; x: 0; y: 0; } } ] @@ -75,7 +75,7 @@ Rectangle { from: "*"; to: "InList" SequentialAnimation { ParentAction{} - PauseAnimation { duration: 50 * (Grid.FlowView.row * 2 + Grid.FlowView.column) } + PauseAnimation { duration: 50 * (GridItem.FlowView.row * 2 + GridItem.FlowView.column) } NumberAnimation { properties: "x,y,rotation"; easing: "easeInOutQuad" } } } @@ -87,7 +87,7 @@ Rectangle { Item { FlowView { - id: ListView + id: MyListView vertical: true y: 40 x: 40 |