diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-09-10 03:23:06 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-09-10 03:23:06 (GMT) |
| commit | 155f7c91e869092962f23c0e1d793cb82fb7544d (patch) | |
| tree | 407c119e3c158bdb321344abf1fa40cf7841ee0f /src/declarative/QmlChanges.txt | |
| parent | 2c0255521f00a1fd95988161a03c39631350eaba (diff) | |
| parent | c41597a34b3435ea2d06f70e90f7d0c561a24215 (diff) | |
| download | Qt-155f7c91e869092962f23c0e1d793cb82fb7544d.zip Qt-155f7c91e869092962f23c0e1d793cb82fb7544d.tar.gz Qt-155f7c91e869092962f23c0e1d793cb82fb7544d.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.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index 9043421..eace089 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -39,6 +39,8 @@ MouseRegion: ymin -> minimumY MouseRegion: ymin -> maximumY Text elements: hAlign -> horizontalAlignment Text elements: vAlign -> verticalAlignment +Text elements: highlightColor -> selectionColor +Text elements: highlightedTextColor -> selectedTextColor State: operations -> changes Transition: operations -> animations Transition: fromState -> from |