diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 16:16:08 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 16:16:08 +0200 |
| commit | acc94a42cd9c31ac68e063edc1caada4251d12b0 (patch) | |
| tree | 19a4816cf3972b3d16235ed601788193fe0f20df /examples/quick/particles | |
| parent | 4c94a3ca55e82ade19ff5d4ab361d40e6252f2da (diff) | |
| parent | 2223f1ae293c2aedf4759564185f74b782395459 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc
examples/quick/accessibility/doc/src/accessibility.qdoc
examples/quick/animation/doc/src/animation.qdoc
examples/quick/canvas/doc/src/canvas.qdoc
examples/quick/draganddrop/doc/src/draganddrop.qdoc
examples/quick/imageelements/doc/src/imageelements.qdoc
examples/quick/keyinteraction/doc/src/keyinteraction.qdoc
examples/quick/localstorage/doc/src/localstorage.qdoc
examples/quick/mousearea/doc/src/mousearea.qdoc
examples/quick/particles/affectors/doc/src/affectors.qdoc
examples/quick/particles/customparticle/doc/src/customparticle.qdoc
examples/quick/particles/emitters/doc/src/emitters.qdoc
examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
examples/quick/particles/system/doc/src/system.qdoc
examples/quick/positioners/doc/src/positioners.qdoc
examples/quick/righttoleft/doc/src/righttoleft.qdoc
examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc
examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc
examples/quick/threading/doc/src/threading.qdoc
examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
examples/quick/views/doc/src/views.qdoc
Change-Id: Idf7bb76c82acacf86b19a9f4633c3cbf4ae1a9a0
Diffstat (limited to 'examples/quick/particles')
5 files changed, 6 insertions, 6 deletions
diff --git a/examples/quick/particles/affectors/doc/src/affectors.qdoc b/examples/quick/particles/affectors/doc/src/affectors.qdoc index 3d0a84e1d4..58661d5b70 100644 --- a/examples/quick/particles/affectors/doc/src/affectors.qdoc +++ b/examples/quick/particles/affectors/doc/src/affectors.qdoc @@ -27,7 +27,7 @@ /*! \title Qt Quick Particles Examples - Affectors - \example quick/particles/affectors + \example particles/affectors \brief This is a collection of examples using Affectors in the QML particle system. \image qml-affectors-example.png diff --git a/examples/quick/particles/customparticle/doc/src/customparticle.qdoc b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc index bb68c5fe9e..ccef82c922 100644 --- a/examples/quick/particles/customparticle/doc/src/customparticle.qdoc +++ b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc @@ -27,7 +27,7 @@ /*! \title Qt Quick Particles Examples - CustomParticle - \example quick/particles/customparticle + \example particles/customparticle \brief This is a collection of examples using CustomParticle in the QML particle system. \image qml-customparticle-example.png diff --git a/examples/quick/particles/emitters/doc/src/emitters.qdoc b/examples/quick/particles/emitters/doc/src/emitters.qdoc index 63cb305c16..8eb7919000 100644 --- a/examples/quick/particles/emitters/doc/src/emitters.qdoc +++ b/examples/quick/particles/emitters/doc/src/emitters.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! \title Qt Quick Particles Examples - Emitters - \example quick/particles/emitters + \example particles/emitters \brief This is a collection of examples using Emitters in the QML particle system. \image qml-emitters-example.png diff --git a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc index 85c1a62a9a..c8f2dc988b 100644 --- a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc +++ b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc @@ -27,7 +27,7 @@ /*! \title Qt Quick Particles Examples - Affectors - \example quick/particles/imageparticle + \example particles/imageparticle \brief This is a collection of examples using Affectors in the QML particle system. \image qml-imageparticle-example.png diff --git a/examples/quick/particles/system/doc/src/system.qdoc b/examples/quick/particles/system/doc/src/system.qdoc index bb32325da3..04dc1727d2 100644 --- a/examples/quick/particles/system/doc/src/system.qdoc +++ b/examples/quick/particles/system/doc/src/system.qdoc @@ -27,7 +27,7 @@ /*! \title Qt Quick Particles Examples - Affectors - \example quick/particles/system + \example particles/system \brief This is a collection of examples using Affectors in the QML particle system. \image qml-system-example.png @@ -40,7 +40,7 @@ Start and Stop simply sets the running and paused states of a ParticleSystem. While the system does not perform any simulation when stopped or paused, a restart restarts the simulation from the beginning, while unpausing resumes the simulation from where it was. - Timed group changes is an example that highlights the ParticleGroup type. While normally referring to groups with a string name is sufficent, additional effects can be + Timed group changes is an example that highlights the ParticleGroup type. While normally referring to groups with a string name is sufficient, additional effects can be done by setting properties on groups. The first group has a variable duration on it, but always transitions to the second group. \snippet quick/particles/system/content/timedgroupchanges.qml 0 |