diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-08-24 05:48:47 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-08-24 05:48:47 (GMT) |
| commit | b979a3d96d63e869fb0d7db55b891d557eecd35f (patch) | |
| tree | a50187d16c1b96cf2401b745dd1998a82d801672 /src/declarative/QmlChanges.txt | |
| parent | 30d5122d981616b085eb5ab24d45b8bfb4496b3b (diff) | |
| parent | 525e6674b002180d691a2d8a787dc512c259ae95 (diff) | |
| download | Qt-b979a3d96d63e869fb0d7db55b891d557eecd35f.zip Qt-b979a3d96d63e869fb0d7db55b891d557eecd35f.tar.gz Qt-b979a3d96d63e869fb0d7db55b891d557eecd35f.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 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index 8588175..e01b9af 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -11,9 +11,12 @@ API Changes Renamed Elements: LineEdit -> TextInput -VerticalLayout -> VerticalPositioner -HorizontalLayout -> HorizontalPositioner -GridLayout -> GridPositioner +VerticalLayout -> Column +HorizontalLayout -> Row +VerticalPositioner -> Column +HorizontalPositioner -> Row +GridLayout -> Grid +GridPositioner -> Grid Rect -> Rectangle FocusRealm -> FocusScope FontFamily -> FontLoader @@ -47,9 +50,9 @@ MouseRegion: add "pressedButtons" property Timer: add start() and stop() slots Deletions: -VerticalPositioner: lost "margins" property -HorizontalPositioner: lost "margins" property -GridPositioner: lost "margins" property +Column/VerticalPositioner: lost "margins" property +Row/HorizontalPositioner: lost "margins" property +Grid/Positioner/Layout: lost "margins" property Other Changes: Drag: axis becomes an enum with values "XAxis", "YAxis", "XandYAxis" |