diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-09-11 06:07:27 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-09-11 06:07:27 (GMT) |
| commit | 1646d52f35d96f9cc4f874b76861b046343d2534 (patch) | |
| tree | 64b741e8282d83bb9ed553771d19f709c73bff84 /examples | |
| parent | bc7e8e12e96ff523278032d7c32c9bd504456de3 (diff) | |
| parent | f7982be51ec5872dba11d87ea653b791251a0215 (diff) | |
| download | Qt-1646d52f35d96f9cc4f874b76861b046343d2534.zip Qt-1646d52f35d96f9cc4f874b76861b046343d2534.tar.gz Qt-1646d52f35d96f9cc4f874b76861b046343d2534.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/listview/highlight.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/loader/Browser.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative/listview/highlight.qml b/examples/declarative/listview/highlight.qml index e707ac0..cb92ad9 100644 --- a/examples/declarative/listview/highlight.qml +++ b/examples/declarative/listview/highlight.qml @@ -44,7 +44,7 @@ Rectangle { id: PetHighlight Rectangle { width: 200; height: 50; color: "#FFFF88" - y: SpringFollow { source: List1.current.y; spring: 3; damping: 0.1 } + y: SpringFollow { source: List1.currentItem.y; spring: 3; damping: 0.1 } } } ListView { diff --git a/examples/declarative/loader/Browser.qml b/examples/declarative/loader/Browser.qml index 196cdc5..6711de4 100644 --- a/examples/declarative/loader/Browser.qml +++ b/examples/declarative/loader/Browser.qml @@ -82,7 +82,7 @@ Rectangle { focus: true Keys.onPressed: { if (event.key == Qt.Key_Return || event.key == Qt.Key_Select) { - View.current.launch(); + View.currentItem.launch(); event.accepted = true; } } |