summaryrefslogtreecommitdiffstats
path: root/src/declarative/QmlChanges.txt
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-09-07 03:53:46 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-09-07 03:53:46 (GMT)
commit8a331b54431905dd171cd874f1c7b441a0b6ae9c (patch)
treef6bbba1188de6544b65fe898dc9a62591c70b64e /src/declarative/QmlChanges.txt
parent462456192424082ccc5ccc7238a751f92521ddcf (diff)
parentb238bb40f8eb3c82b03f179cbc516013bdbadf1e (diff)
downloadQt-8a331b54431905dd171cd874f1c7b441a0b6ae9c.zip
Qt-8a331b54431905dd171cd874f1c7b441a0b6ae9c.tar.gz
Qt-8a331b54431905dd171cd874f1c7b441a0b6ae9c.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/QmlChanges.txt')
-rw-r--r--src/declarative/QmlChanges.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index 7dda5cc..95c81c7 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -78,6 +78,7 @@ Other Changes:
Drag: axis becomes an enum with values "XAxis", "YAxis", "XandYAxis"
Image: scaleGrid property removed. New item called BorderImage instead.
KeyActions: changed to a Keys attached property on any item.
+KeyProxy: changed to a Keys.forwardTo property on any item.
Pending Changes
===============