diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-08-27 03:44:02 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-08-27 03:44:02 (GMT) |
| commit | b888ba48306174fc365499885f395b1dd70efd09 (patch) | |
| tree | 47cfb8fd8369025c7c113a6d456ef7d9a2da7710 /examples/declarative | |
| parent | 928e81b68e0b695662c7ee3dd0bfa409a7ca1ffd (diff) | |
| parent | 0a56a0b9fe8fe34d8671daf4c664df99becfc14d (diff) | |
| download | Qt-b888ba48306174fc365499885f395b1dd70efd09.zip Qt-b888ba48306174fc365499885f395b1dd70efd09.tar.gz Qt-b888ba48306174fc365499885f395b1dd70efd09.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples/declarative')
| -rw-r--r-- | examples/declarative/easing/easing.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/follow/pong.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/listview/itemlist.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/minehunt/minehunt.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/velocity/Day.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/velocity/velocity.qml | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/examples/declarative/easing/easing.qml b/examples/declarative/easing/easing.qml index 60c2040..df301d8 100644 --- a/examples/declarative/easing/easing.qml +++ b/examples/declarative/easing/easing.qml @@ -56,7 +56,7 @@ Rectangle { anchors.left: Window.left anchors.right: Window.right Repeater { - dataSource: EasingTypes + model: EasingTypes Component { Text { id: Text diff --git a/examples/declarative/follow/pong.qml b/examples/declarative/follow/pong.qml index d2aaba9..0314bb8 100644 --- a/examples/declarative/follow/pong.qml +++ b/examples/declarative/follow/pong.qml @@ -63,7 +63,7 @@ Rectangle { Rectangle { color: "#00ee00"; x: Page.width/2+40; y: 0; width: 40; height: 60 } Rectangle { color: "#000000"; x: Page.width/2+50; y: 10; width: 20; height: 40 } Repeater { - dataSource: Page.height/20 + model: Page.height/20 Rectangle { color: "#00ee00"; x: Page.width/2-5; y: index*20; width: 10; height: 10 } } } diff --git a/examples/declarative/listview/itemlist.qml b/examples/declarative/listview/itemlist.qml index c25ee59..061fab3 100644 --- a/examples/declarative/listview/itemlist.qml +++ b/examples/declarative/listview/itemlist.qml @@ -44,7 +44,7 @@ Rectangle { anchors.centerIn: parent spacing: 20 Repeater { - dataSource: ItemModel.count + model: ItemModel.count Rectangle { width: 5; height: 5 radius: 3 diff --git a/examples/declarative/minehunt/minehunt.qml b/examples/declarative/minehunt/minehunt.qml index 11748a8..4bae64d 100644 --- a/examples/declarative/minehunt/minehunt.qml +++ b/examples/declarative/minehunt/minehunt.qml @@ -130,7 +130,7 @@ Item { anchors.verticalCenter: parent.verticalCenter } Repeater { - dataSource: tiles + model: tiles x: 1 y: 1 Component { diff --git a/examples/declarative/velocity/Day.qml b/examples/declarative/velocity/Day.qml index e488ae1..1a336b7 100644 --- a/examples/declarative/velocity/Day.qml +++ b/examples/declarative/velocity/Day.qml @@ -26,7 +26,7 @@ Rectangle { styleColor: "#dedede" } Repeater { - dataSource: Page.stickies + model: Page.stickies Item { x: Math.random() * 200 + 100 y: Math.random() * 300 + 50 diff --git a/examples/declarative/velocity/velocity.qml b/examples/declarative/velocity/velocity.qml index c2425da..8ac42e1 100644 --- a/examples/declarative/velocity/velocity.qml +++ b/examples/declarative/velocity/velocity.qml @@ -101,7 +101,7 @@ Rectangle { Row { id: Lay Repeater { - dataSource: List + model: List Component { Day { day: name |