diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:29:32 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:37:03 +0100 |
| commit | 4821058f10118be55a541ad39e25ec9165cca3b3 (patch) | |
| tree | 167973e3c68fc442b0e37d6f628f3fdbe759f15a /doc/src/whatsnew.qdoc | |
| parent | 83f11e33745180e9370d484cbcedd0bac020c9dd (diff) | |
| parent | 26d5f2e833f0e3686aaa27e695bbfab5fbd808ad (diff) | |
Merge master into api_changes
Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/quick/util/qquickimageprovider.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
Diffstat (limited to 'doc/src/whatsnew.qdoc')
| -rw-r--r-- | doc/src/whatsnew.qdoc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/src/whatsnew.qdoc b/doc/src/whatsnew.qdoc index c791e72c25..1997a42a6b 100644 --- a/doc/src/whatsnew.qdoc +++ b/doc/src/whatsnew.qdoc @@ -40,10 +40,10 @@ QtQuick 2 is based on an OpenGL scenegraph. The following classes replace their equivalents in QtQuick 1: \list -\o QQuickView -\o QQuickCanvas -\o QQuickItem -\o QQuickPaintedItem +\li QQuickView +\li QQuickCanvas +\li QQuickItem +\li QQuickPaintedItem \endlist \section2 QML Engine/Language Improvements @@ -100,7 +100,7 @@ You can still ignore these events in the handler to let them pass through. This behavior is triggered with the new property propagateComposedEvents. The Binding element can now be used as a value source, and will also restore any previously -set binding when its \i when clause becomes false. +set binding when its \e when clause becomes false. Flickable: added dragging, draggingHorizontally and draggingVerically properties. Added topMargin, bottomMargin, leftMargin, rightMargin, xOrigin, yOrigin properties. @@ -114,8 +114,8 @@ of integers. Positioner (Row, Column, Grid, Flow) improvements: \list -\o Transitions used for \c add and \c move now have improved features: they can access a ViewTransition attached property (see the ViewTransition documentation for examples) and can now animate arbitrary item properties (instead of being restricted to animating an item's position). -\o Items in a positioner now have attached properties that can be used to determine a subitem's location: Positioner.index, Positioner.isFirstItem, Positioner.isLastItem. +\li Transitions used for \c add and \c move now have improved features: they can access a ViewTransition attached property (see the ViewTransition documentation for examples) and can now animate arbitrary item properties (instead of being restricted to animating an item's position). +\li Items in a positioner now have attached properties that can be used to determine a subitem's location: Positioner.index, Positioner.isFirstItem, Positioner.isLastItem. \endlist Loader improvements: |