diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-24 22:37:33 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-24 22:37:33 +0200 |
| commit | ed86fb2dbd4d4887e4c7b2d37f7842ac64a5e860 (patch) | |
| tree | 0703b80939874a7bb9e7a4028a07d998d866010d /examples/quick/particles | |
| parent | 2d065ddb53a31c1b717c88902bcdf4f6b24f320f (diff) | |
| parent | 7320f61e8782119a3f95d85f67fb9c7a973d043a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I444ed90a02eebe1f68cfa48be5d75544123ab10d
Diffstat (limited to 'examples/quick/particles')
| -rw-r--r-- | examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc | 2 | ||||
| -rw-r--r-- | examples/quick/particles/system/doc/src/system.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc index 4fda13746a..ea94a4bc39 100644 --- a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc +++ b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \title Qt Quick Particles Examples - Affectors + \title Qt Quick Particles Examples - Image Particles \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 99be23d9d1..385cd927da 100644 --- a/examples/quick/particles/system/doc/src/system.qdoc +++ b/examples/quick/particles/system/doc/src/system.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \title Qt Quick Particles Examples - Affectors + \title Qt Quick Particles Examples - System \example particles/system \brief This is a collection of examples using Affectors in the QML particle system. \image qml-system-example.png |