diff options
Diffstat (limited to 'doc/src')
11 files changed, 41 insertions, 59 deletions
diff --git a/doc/src/examples/examples-groups.qdoc b/doc/src/examples/examples-groups.qdoc index 9a6dafa435..0ecd117128 100644 --- a/doc/src/examples/examples-groups.qdoc +++ b/doc/src/examples/examples-groups.qdoc @@ -32,15 +32,6 @@ \brief This is an internationalization example */ /*! - \title QML Examples - Shader Effects - \example declarative/shadereffects - \image qml-shadereffects-example.png - \brief This is a shader effects example - - This example demonstrates a couple of visual effects that you can perform - with shaders in QtQuick 2.0 -*/ -/*! \title QML Examples - Positioners \example declarative/positioners \brief This is a positioners example @@ -49,26 +40,6 @@ This example demonstrates the positioners and some of their animations. */ /*! - \title QML Examples - Animation - \example declarative/animation - \brief This is a collection of QML examples - \image qml-animations-example.png - - This is a collection of small QML examples relating to animation. Each example is - a small QML file, usually containing or emphasizing a particular element or - feature. You can run and observe the behavior of each example. -*/ -/*! - \title QML Examples - Image Elements - \example declarative/imageelements - \brief This is a collection of QML examples - \image qml-imageelements-example.png - - This is a collection of small QML examples relating to image elements. Each example is - a small QML file, usually containing or emphasizing a particular element or - feature. You can run and observe the behavior of each example. -*/ -/*! \title QML Examples - Models and Views \example declarative/modelviews \brief This is a collection of QML examples diff --git a/doc/src/examples/examples-toys.qdoc b/doc/src/examples/examples-toys.qdoc index f076c1de6c..7414579e19 100644 --- a/doc/src/examples/examples-toys.qdoc +++ b/doc/src/examples/examples-toys.qdoc @@ -27,13 +27,6 @@ /*! - \title QML Example - Calculator - \example declarative/calculator - \brief This is an example application written in QML. - \image qml-calculator-demo-small.png -*/ - -/*! \title QML Example - Samegame \example declarative/samegame \brief This example demonstrates creating a game with javascript game logic. diff --git a/doc/src/localstorage/localstorage.qdoc b/doc/src/localstorage/localstorage.qdoc index 406de25339..5287120e86 100644 --- a/doc/src/localstorage/localstorage.qdoc +++ b/doc/src/localstorage/localstorage.qdoc @@ -33,9 +33,24 @@ The local storage API provides a JavaScript interface to an SQL relational database. The QtQuick.LocalStorage module contains the API and it may be given a namespace. +Import QtQuick.LocalStorage module from QML: \code -import QtQuick.LocalStorage 2.0 as SQL +//sql.qml + +import QtQuick.LocalStorage 2.0 as Sql +\endcode + + +Import QtQuick.LocalStorage module from JavaScript: +\code +//sql.js +.import QtQuick.LocalStorage 2.0 as Sql \endcode + +Note, importing a module from JavaScript is different from importing from QML. +The \l{JavaScript Code} article contains detailed information on importing in JavaScript code. + + \section2 Database API The \c openDatabaseSync() and related functions diff --git a/doc/src/snippets/qml/viewtransitions/viewtransitions-basic.qml b/doc/src/snippets/qml/viewtransitions/viewtransitions-basic.qml index 8a05491ee1..cb94acb2b1 100644 --- a/doc/src/snippets/qml/viewtransitions/viewtransitions-basic.qml +++ b/doc/src/snippets/qml/viewtransitions/viewtransitions-basic.qml @@ -60,7 +60,7 @@ ListView { NumberAnimation { property: "scale"; from: 0; to: 1.0; duration: 400 } } - addDisplaced: Transition { + displaced: Transition { NumberAnimation { properties: "x,y"; duration: 400; easing.type: Easing.OutBounce } } diff --git a/doc/src/snippets/qml/viewtransitions/viewtransitions-delayedbyindex.qml b/doc/src/snippets/qml/viewtransitions/viewtransitions-delayedbyindex.qml index 79d00d2d1c..84c4848a76 100644 --- a/doc/src/snippets/qml/viewtransitions/viewtransitions-delayedbyindex.qml +++ b/doc/src/snippets/qml/viewtransitions/viewtransitions-delayedbyindex.qml @@ -60,12 +60,12 @@ ListView { } //! [0] - addDisplaced: Transition { - id: addDispTrans + displaced: Transition { + id: dispTrans SequentialAnimation { PauseAnimation { - duration: (addDispTrans.ViewTransition.index - - addDispTrans.ViewTransition.targetIndexes[0]) * 100 + duration: (dispTrans.ViewTransition.index - + dispTrans.ViewTransition.targetIndexes[0]) * 100 } NumberAnimation { properties: "x,y"; duration: 400; easing.type: Easing.OutBounce } } diff --git a/doc/src/snippets/qml/viewtransitions/viewtransitions-intermediatemove.qml b/doc/src/snippets/qml/viewtransitions/viewtransitions-intermediatemove.qml index a43d3a8b7f..89353b40e8 100644 --- a/doc/src/snippets/qml/viewtransitions/viewtransitions-intermediatemove.qml +++ b/doc/src/snippets/qml/viewtransitions/viewtransitions-intermediatemove.qml @@ -60,20 +60,20 @@ ListView { } //! [0] - addDisplaced: Transition { - id: addDispTrans + displaced: Transition { + id: dispTrans SequentialAnimation { PauseAnimation { - duration: (addDispTrans.ViewTransition.index - - addDispTrans.ViewTransition.targetIndexes[0]) * 100 + duration: (dispTrans.ViewTransition.index - + dispTrans.ViewTransition.targetIndexes[0]) * 100 } ParallelAnimation { NumberAnimation { - property: "x"; to: addDispTrans.ViewTransition.item.x + 20 + property: "x"; to: dispTrans.ViewTransition.item.x + 20 easing.type: Easing.OutQuad } NumberAnimation { - property: "y"; to: addDispTrans.ViewTransition.item.y + 50 + property: "y"; to: dispTrans.ViewTransition.item.y + 50 easing.type: Easing.OutQuad } } diff --git a/doc/src/snippets/qml/viewtransitions/viewtransitions-interruptedgood.qml b/doc/src/snippets/qml/viewtransitions/viewtransitions-interruptedgood.qml index 1355268710..0644caaec7 100644 --- a/doc/src/snippets/qml/viewtransitions/viewtransitions-interruptedgood.qml +++ b/doc/src/snippets/qml/viewtransitions/viewtransitions-interruptedgood.qml @@ -60,7 +60,7 @@ ListView { } //! [0] - addDisplaced: Transition { + displaced: Transition { NumberAnimation { properties: "x,y"; duration: 400; easing.type: Easing.OutBounce } // ensure opacity and scale values return to 1.0 diff --git a/doc/src/snippets/qml/viewtransitions/viewtransitions-pathanim.qml b/doc/src/snippets/qml/viewtransitions/viewtransitions-pathanim.qml index 3d075c4367..4b1685719d 100644 --- a/doc/src/snippets/qml/viewtransitions/viewtransitions-pathanim.qml +++ b/doc/src/snippets/qml/viewtransitions/viewtransitions-pathanim.qml @@ -76,20 +76,20 @@ ListView { } //! [0] - addDisplaced: Transition { - id: addDispTrans + displaced: Transition { + id: dispTrans SequentialAnimation { PauseAnimation { - duration: (addDispTrans.ViewTransition.index - - addDispTrans.ViewTransition.targetIndexes[0]) * 100 + duration: (dispTrans.ViewTransition.index - + dispTrans.ViewTransition.targetIndexes[0]) * 100 } ParallelAnimation { NumberAnimation { - property: "x"; to: addDispTrans.ViewTransition.item.x + 20 + property: "x"; to: dispTrans.ViewTransition.item.x + 20 easing.type: Easing.OutQuad } NumberAnimation { - property: "y"; to: addDispTrans.ViewTransition.item.y + 50 + property: "y"; to: dispTrans.ViewTransition.item.y + 50 easing.type: Easing.OutQuad } } diff --git a/doc/src/snippets/qml/viewtransitions/viewtransitions-scriptactionbad.qml b/doc/src/snippets/qml/viewtransitions/viewtransitions-scriptactionbad.qml index 03348356e1..0e7d1e8d82 100644 --- a/doc/src/snippets/qml/viewtransitions/viewtransitions-scriptactionbad.qml +++ b/doc/src/snippets/qml/viewtransitions/viewtransitions-scriptactionbad.qml @@ -70,7 +70,7 @@ ListView { } } - moveDisplaced: Transition { + displaced: Transition { NumberAnimation { properties: "x,y"; duration: 400; easing.type: Easing.OutBounce } } diff --git a/doc/src/snippets/qml/viewtransitions/viewtransitions-scriptactiongood.qml b/doc/src/snippets/qml/viewtransitions/viewtransitions-scriptactiongood.qml index eda5c35479..7fa7e48f82 100644 --- a/doc/src/snippets/qml/viewtransitions/viewtransitions-scriptactiongood.qml +++ b/doc/src/snippets/qml/viewtransitions/viewtransitions-scriptactiongood.qml @@ -73,7 +73,7 @@ ListView { } //! [0] - moveDisplaced: Transition { + displaced: Transition { NumberAnimation { properties: "x,y"; duration: 400; easing.type: Easing.OutBounce } } diff --git a/doc/src/whatsnew.qdoc b/doc/src/whatsnew.qdoc index bf77e0e6c0..c791e72c25 100644 --- a/doc/src/whatsnew.qdoc +++ b/doc/src/whatsnew.qdoc @@ -112,8 +112,11 @@ Setting Image sourceSize.width and sourceSize.height will now fit the image to t Grid now has rowSpacing and columnSpacing properties. Spacing properties on positioners are now real numbers instead of integers. -Positioners now have attached properties that can be used to determine a subitem's location within a -container such as Column or Row: Positioner.index, Positioner.isFirstItem, Positioner.isLastItem. +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. +\endlist Loader improvements: - "active" property added to Loader, to allow delaying instantiation of a Loader element's item property |