summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-08-20 06:42:08 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-08-20 06:42:08 (GMT)
commit50fd8253b534d657d7ab6e2dd88c14d3943f869c (patch)
treeba748cd9f978d13cd8d347ac2525bb1cdf563124 /src/declarative
parentfa66c623a7a7bd930bf7efc022a2de7501948d84 (diff)
parent7e5db00742c94ae9780231a6cec36a827122fd7f (diff)
downloadQt-50fd8253b534d657d7ab6e2dd88c14d3943f869c.zip
Qt-50fd8253b534d657d7ab6e2dd88c14d3943f869c.tar.gz
Qt-50fd8253b534d657d7ab6e2dd88c14d3943f869c.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
-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 632b116..1897adc 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -39,6 +39,7 @@ GridPositioner: lost "margins" property
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.
Pending Changes
===============