diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-13 05:36:54 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-13 05:36:54 (GMT) |
| commit | 601b52bb6520e94b2a573a7925d5f141ee60c312 (patch) | |
| tree | 6f361a894dd274a973e0098147ec862966d9459e /demos/declarative/flickr | |
| parent | 5731119be208ffb7d2967746cea2df54424b7885 (diff) | |
| parent | b1e221a249adbcec7e37e475fdd14ff636c18b2c (diff) | |
| download | Qt-601b52bb6520e94b2a573a7925d5f141ee60c312.zip Qt-601b52bb6520e94b2a573a7925d5f141ee60c312.tar.gz Qt-601b52bb6520e94b2a573a7925d5f141ee60c312.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos/declarative/flickr')
| -rw-r--r-- | demos/declarative/flickr/content/LikeOMeter.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/flickr/content/MediaLineEdit.qml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/demos/declarative/flickr/content/LikeOMeter.qml b/demos/declarative/flickr/content/LikeOMeter.qml index 88a28b6..0ba79b1 100644 --- a/demos/declarative/flickr/content/LikeOMeter.qml +++ b/demos/declarative/flickr/content/LikeOMeter.qml @@ -5,7 +5,7 @@ Item { property int rating: 2 - HorizontalLayout { + HorizontalPositioner { Star { rating: 0 onClicked: { Container.rating = rating } diff --git a/demos/declarative/flickr/content/MediaLineEdit.qml b/demos/declarative/flickr/content/MediaLineEdit.qml index 4a55ff5..e175b4e 100644 --- a/demos/declarative/flickr/content/MediaLineEdit.qml +++ b/demos/declarative/flickr/content/MediaLineEdit.qml @@ -102,8 +102,8 @@ Item { anchors.fill: Container targets: [(ReturnKey), (Editor)] } - KeyActions { + Item { id: ReturnKey - keyReturn: "Container.state = ''" + Keys.onReturnPressed: "Container.state = ''" } } |