diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 15:21:52 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 15:23:09 +0100 |
| commit | 49651307807fc097d14ae13fb71013e46944eb2a (patch) | |
| tree | 3bc227a47f42c2edb7ff4b69fc183b4a99fe0bf3 /examples/quick/particles | |
| parent | 15b232bf694fedf553abac09af077a58ce571f9d (diff) | |
| parent | f4d4689d3c09cb4eae30be892be426d4fa185ed4 (diff) | |
Merge branch 'release' into stable
Change-Id: Ic270f7814489b2c7df7e0f1ecb46cd516802cac5
Diffstat (limited to 'examples/quick/particles')
| -rw-r--r-- | examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc | 2 | ||||
| -rw-r--r-- | examples/quick/particles/particles.pro | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc index 818d76b7bf..1de194b962 100644 --- a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc +++ b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc @@ -38,7 +38,7 @@ \snippet quick/particles/imageparticle/content/allatonce.qml 0 Colored shows a simple ImageParticle with some color variation. - \snippet particles/imageparticle/content/colored.qml 0 + \snippet quick/particles/imageparticle/content/colored.qml 0 Color Table sets the color over life on the particles to provide a fixed rainbow effect. \snippet quick/particles/imageparticle/content/colortable.qml 0 diff --git a/examples/quick/particles/particles.pro b/examples/quick/particles/particles.pro index 9200113be8..2ea61751fb 100644 --- a/examples/quick/particles/particles.pro +++ b/examples/quick/particles/particles.pro @@ -6,6 +6,7 @@ SUBDIRS += affectors \ system EXAMPLE_FILES = \ + images.qrc \ itemparticle #Install shared images too |