diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-09-09 05:48:28 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-09-09 05:48:28 (GMT) |
| commit | a5ed015bc369483206382689b77a4af0aaf0c547 (patch) | |
| tree | 53abb53b912b60fc3efb826240fbf668a4a2b8c1 /src/declarative/QmlChanges.txt | |
| parent | 543b7355a03a7010ec767dba3f538b96aacc4e89 (diff) | |
| parent | ae7a3485c0e6748361789491af33ee7b7fe093bc (diff) | |
| download | Qt-a5ed015bc369483206382689b77a4af0aaf0c547.zip Qt-a5ed015bc369483206382689b77a4af0aaf0c547.tar.gz Qt-a5ed015bc369483206382689b77a4af0aaf0c547.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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index db1c73a..87873f2 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -69,6 +69,8 @@ MouseRegion: add "pressedButtons" property Timer: add start() and stop() slots WebView: add newWindowComponent and newWindowParent properties Loader: add status() and progress() properties +Loader: add sourceComponent property +Loader: add resizeMode property Deletions: Column/VerticalPositioner: lost "margins" property @@ -76,6 +78,7 @@ Row/HorizontalPositioner: lost "margins" property Grid/Positioner/Layout: lost "margins" property WebView: lost "interactive" property (always true now) Flickable: removed "dragMode" property +ComponentInstance: removed. Replaced by Loader.sourceComponent Other Changes: Drag: axis becomes an enum with values "XAxis", "YAxis", "XandYAxis" |