diff options
| author | Peter Yard <peter.yard@nokia.com> | 2010-05-14 00:17:40 (GMT) |
|---|---|---|
| committer | Peter Yard <peter.yard@nokia.com> | 2010-05-14 00:17:40 (GMT) |
| commit | 124e9a761b3cab7414d3ddeaa8e8f2455b6598ad (patch) | |
| tree | 518c22b7317c5646d2ce0adc5deb5818b2ea0af6 /src/declarative/QmlChanges.txt | |
| parent | dcc9a7e72fe4c283df59378d08d75aecfa3b3b05 (diff) | |
| parent | ac519ee416e06f4ab471f102da306f94de21c90d (diff) | |
| download | Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.zip Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.tar.gz Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
examples/declarative/dial/dial-example.qml
Diffstat (limited to 'src/declarative/QmlChanges.txt')
| -rw-r--r-- | src/declarative/QmlChanges.txt | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index 9c46467..9ab3f08 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -1,7 +1,18 @@ ============================================================================= The changes below are pre Qt 4.7.0 RC -Flickable: overShoot is replaced by boundsBehavior enumeration. +Flickable: + - overShoot is replaced by boundsBehavior enumeration + - flicking is replaced by flickingHorizontally and flickingVertically + - moving is replaced by movingHorizontally and movingVertically + - flickDirection is renamed flickableDirection + - onMovementStarted, onMovementEnded, onFlickStarted and onFlickEnded signals removed +Component: isReady, isLoading, isError and isNull properties removed, use + status property instead +QList<QObject*> models no longer provide properties in model object. The +properties are now updated when the object changes. An object's property +"foo" may now be accessed as "foo", modelData.foo" or model.modelData.foo" +component.createObject has gained a mandatory "parent" argument C++ API ------- @@ -9,7 +20,7 @@ QDeclarativeExpression::value() has been renamed to QDeclarativeExpression::evaluate() ============================================================================= -The changes below are pre Qt 4.7.0 beta +The changes below are pre Qt 4.7.0 beta 1 TextEdit: wrap property is replaced by wrapMode enumeration. Text: wrap property is replaced by wrapMode enumeration. |