summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-02-22 05:11:11 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-02-22 05:11:11 (GMT)
commit5f63321e3fe2b436d469d2722dc464ea4c7830c4 (patch)
tree06c0eacba36e486dda1b18afc6ce51421e62fdfb
parent1ad3918809ea6c4ac3c1b185581f1c8e76f02aca (diff)
parent13a3ed1cd9a8eab5facb3b108bb8bafbfb453838 (diff)
downloadQt-5f63321e3fe2b436d469d2722dc464ea4c7830c4.zip
Qt-5f63321e3fe2b436d469d2722dc464ea4c7830c4.tar.gz
Qt-5f63321e3fe2b436d469d2722dc464ea4c7830c4.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
-rw-r--r--src/declarative/QmlChanges.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index a2afc1b..06fa720 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -28,6 +28,11 @@ ListModel
- foo: true is now a bool (not string "true")
- foo: false is now a bool (not string "false" == true!)
+PropertyAnimation
+------------------
+matchProperties and matchTargets have been renamed back to properties and targets.
+The semantics are explained in the PropertyAnimation::properties documentation
+and the animation overview documentation.
=============================================================================
The changes below are pre-4.6.0 release.