summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-08-13 02:33:55 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-08-13 02:33:55 (GMT)
commitd51aa99179c0a30a7c78d8cf36d86f85ca887f7c (patch)
tree16dbb14cc15f4b1b9592a1a5bece302dacbea26b
parent4a8f38ed6ef6c1cb4a0ac7d2e123b6c42332fd07 (diff)
parent66e3930a320419183bbc953bbf16859c29d0e2fc (diff)
downloadQt-d51aa99179c0a30a7c78d8cf36d86f85ca887f7c.zip
Qt-d51aa99179c0a30a7c78d8cf36d86f85ca887f7c.tar.gz
Qt-d51aa99179c0a30a7c78d8cf36d86f85ca887f7c.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
-rw-r--r--demos/declarative/flickr/content/MediaLineEdit.qml4
1 files changed, 2 insertions, 2 deletions
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 = ''"
}
}