diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-08-20 05:58:46 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-08-20 05:58:46 (GMT) |
| commit | 60ab6d5c526051824669da37e7a2850c43ddecbb (patch) | |
| tree | 4849b0cb4895d932e43ee584bfe21f96819fad06 /src/declarative | |
| parent | 9d89a023ca57df3bdd1b2c59b35ac1c00ce77e45 (diff) | |
| parent | a80154c9cdc43d3f1b9d0eb3e95b586dc18d8bc9 (diff) | |
| download | Qt-60ab6d5c526051824669da37e7a2850c43ddecbb.zip Qt-60ab6d5c526051824669da37e7a2850c43ddecbb.tar.gz Qt-60ab6d5c526051824669da37e7a2850c43ddecbb.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/QmlChanges.txt | 4 | ||||
| -rw-r--r-- | src/declarative/fx/qfxmouseregion.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index 82f2292..094393e 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -12,6 +12,9 @@ LineEdit -> TextInput VerticalLayout -> VerticalPositioner HorizontalLayout -> HorizontalPositioner GridLayout -> GridPositioner +Rect -> Rectangle +FocusRealm -> FocusScope +FontFamily -> FontLoader Renamed properties: MouseRegion: xmin -> minimumX @@ -31,6 +34,7 @@ GridPositioner: lost "margins" property Other Changes: Drag: axis becomes an enum with values "XAxis", "YAxis", "XandYAxis" +Image: scaleGrid property removed. New item called BorderImage instead. Pending Changes =============== diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp index 6c71a9b..1c0adc4 100644 --- a/src/declarative/fx/qfxmouseregion.cpp +++ b/src/declarative/fx/qfxmouseregion.cpp @@ -467,7 +467,7 @@ void QFxMouseRegion::timerEvent(QTimerEvent *event) } /*! - \qmlproperty bool hoverEnabled + \qmlproperty bool MouseRegion::hoverEnabled This property holds whether hover events are handled. By default, mouse events are only handled in response to a button event, or when a button is |