diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-08-28 06:50:06 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-08-28 06:50:06 (GMT) |
| commit | ab643ba4d2193352302d237ae36e1246b5399176 (patch) | |
| tree | 095cb3db01be9c169a5e602f767f610490ca9696 /src/declarative/QmlChanges.txt | |
| parent | 67ca33d53ff805ca33ba775524086a89cb975df9 (diff) | |
| parent | 797162603f35af1f67dd5a7c35c7004eef1828a9 (diff) | |
| download | Qt-ab643ba4d2193352302d237ae36e1246b5399176.zip Qt-ab643ba4d2193352302d237ae36e1246b5399176.tar.gz Qt-ab643ba4d2193352302d237ae36e1246b5399176.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/QmlChanges.txt
Diffstat (limited to 'src/declarative/QmlChanges.txt')
| -rw-r--r-- | src/declarative/QmlChanges.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index e760037..069bf49 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -47,17 +47,25 @@ Flickable: yPosition -> viewportY Flickable: xVelocity -> horizontalVelocity Flickable: yVelocity -> verticalVelocity Flickable: velocityDecay -> reportedVelocitySmoothing +WebView: idealWidth -> preferredWidth +WebView: idealHeight -> preferredHeight +WebView: status -> statusText +WebView: mouseX -> clickX (parameter to onDoubleClick) +WebView: mouseY -> clickY (parameter to onDoubleClick) +WebView: cacheSize -> pixelCacheSize Additions: MouseRegion: add "acceptedButtons" property MouseRegion: add "hoverEnabled" property MouseRegion: add "pressedButtons" property Timer: add start() and stop() slots +WebView: add newWindowComponent and newWindowParent properties Deletions: Column/VerticalPositioner: lost "margins" property Row/HorizontalPositioner: lost "margins" property Grid/Positioner/Layout: lost "margins" property +WebView: lost "interactive" property (always true now) Other Changes: Drag: axis becomes an enum with values "XAxis", "YAxis", "XandYAxis" |