diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-20 06:05:23 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-20 06:05:23 (GMT) |
| commit | 4faf461051c72fe42b180dab3e048810304eec16 (patch) | |
| tree | 3fa1c078471bafe12b42d6e4be21da1de90684fd /src/declarative/QmlChanges.txt | |
| parent | 25ee7ca64a1ba35810c026f602be31cbf9dd2d3f (diff) | |
| parent | 60ab6d5c526051824669da37e7a2850c43ddecbb (diff) | |
| download | Qt-4faf461051c72fe42b180dab3e048810304eec16.zip Qt-4faf461051c72fe42b180dab3e048810304eec16.tar.gz Qt-4faf461051c72fe42b180dab3e048810304eec16.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, 1 insertions, 1 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index 5129d60..632b116 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -29,6 +29,7 @@ Transition: operations -> animations Additions: MouseRegion: add "acceptedButtons" property MouseRegion: add "hoverEnabled" property +Timer: add start() and stop() slots Deletions: VerticalPositioner: lost "margins" property @@ -63,4 +64,3 @@ PropertyAction::target (if possible) Additions: MouseRegion: add "pressedButtons" property Connection: add "slot" property -Timer: add start() and stop() slots |