summaryrefslogtreecommitdiffstats
path: root/src/declarative/QmlChanges.txt
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-09-09 05:14:50 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-09-09 05:14:50 (GMT)
commitd03ed1d1ff45ff484f35ace9d90f6c84dd73aa21 (patch)
tree954527301ce27777e5ec26f0b9c9abaee07e5481 /src/declarative/QmlChanges.txt
parent6878a0b7c507d21366cacee0a09bafeb81726d82 (diff)
parenta57af1d6856ffa3a50eb1e0cdd1653b7b4ebdb41 (diff)
downloadQt-d03ed1d1ff45ff484f35ace9d90f6c84dd73aa21.zip
Qt-d03ed1d1ff45ff484f35ace9d90f6c84dd73aa21.tar.gz
Qt-d03ed1d1ff45ff484f35ace9d90f6c84dd73aa21.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.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index 42a8415..87873f2 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -59,6 +59,8 @@ WebView: status -> statusText
WebView: mouseX -> clickX (parameter to onDoubleClick)
WebView: mouseY -> clickY (parameter to onDoubleClick)
WebView: cacheSize -> pixelCacheSize
+Repeater: component -> delegate
+Repeater: dataSource -> model
Additions:
MouseRegion: add "acceptedButtons" property