diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-09-03 05:49:22 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-09-03 05:49:22 (GMT) |
| commit | cece4361fc7048272c251ba19bb78fe236fc01c1 (patch) | |
| tree | fb07440f97e717a5c3753c5d0e305d92907fe902 /src/declarative/QmlChanges.txt | |
| parent | 3732fb8ac1ef79b47a4e8df9c37154618a1adc5e (diff) | |
| parent | 17ffae16bd1ea4e4c37b2ef3d0dc0de2d5a517a1 (diff) | |
| download | Qt-cece4361fc7048272c251ba19bb78fe236fc01c1.zip Qt-cece4361fc7048272c251ba19bb78fe236fc01c1.tar.gz Qt-cece4361fc7048272c251ba19bb78fe236fc01c1.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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index a401a70..b24f6fe 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -48,6 +48,10 @@ Flickable: xVelocity -> horizontalVelocity Flickable: yVelocity -> verticalVelocity Flickable: velocityDecay -> reportedVelocitySmoothing Flickable: locked -> interactive (note reversal of meaning) +Flickable: pageXPosition -> visibleArea.xPosition +Flickable: pageYPosition -> visibleArea.yPosition +Flickable: pageWidth -> visibleArea.widthRatio +Flickable: pageHeight -> visibleArea.heightRatio WebView: idealWidth -> preferredWidth WebView: idealHeight -> preferredHeight WebView: status -> statusText @@ -67,6 +71,7 @@ Column/VerticalPositioner: lost "margins" property Row/HorizontalPositioner: lost "margins" property Grid/Positioner/Layout: lost "margins" property WebView: lost "interactive" property (always true now) +Flickable: removed "dragMode" property Other Changes: Drag: axis becomes an enum with values "XAxis", "YAxis", "XandYAxis" |