diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-11-05 05:01:16 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-11-05 05:01:16 (GMT) |
| commit | 085dd75830357b359abf53b7d37c049cdd17977c (patch) | |
| tree | 67795686c5afdeac7d1eebde5a66dfa330353283 /doc/src | |
| parent | aa6f6174374e0abfe94f37ccefce2d0e2b5fe13e (diff) | |
| parent | e4e3b8f336b6c7d0dd52d4b8af96fee1dc628783 (diff) | |
| download | Qt-085dd75830357b359abf53b7d37c049cdd17977c.zip Qt-085dd75830357b359abf53b7d37c049cdd17977c.tar.gz Qt-085dd75830357b359abf53b7d37c049cdd17977c.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/declarative/advtutorial4.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/declarative/modules.qdoc | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/doc/src/declarative/advtutorial4.qdoc b/doc/src/declarative/advtutorial4.qdoc index e30fe84..5f8c0e9 100644 --- a/doc/src/declarative/advtutorial4.qdoc +++ b/doc/src/declarative/advtutorial4.qdoc @@ -106,9 +106,9 @@ the block, like so: \snippet declarative/tutorials/samegame/samegame4/content/BoomBlock.qml 3 -To fully understand this you'll want to look at the Particles element documentation, but it's important to note that count is set -to zero. -We next extend the 'dying' state, which triggers the particles by setting the count to non-zero. The code for the states now look +To fully understand this you'll want to look at the Particles element documentation, but it's important to note that emissionRate is set +to zero, so that no particles are emitted normally. +We next extend the 'dying' state, which creates a burst of particles by calling the burst method on the particles element. The code for the states now look like this: \snippet declarative/tutorials/samegame/samegame4/content/BoomBlock.qml 4 diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc index 2f7cb57..1491fea 100644 --- a/doc/src/declarative/modules.qdoc +++ b/doc/src/declarative/modules.qdoc @@ -91,14 +91,16 @@ mapping from all type names to versioned QML files. It is a list of lines of the \code # <Comment> -<TypeName> <VersionRange> <File> +<TypeName> <InitialVersion> <File> \endcode -<TypeName> is the type being made available; <VersionRange> is either a single version -number like \c 4.0 or a range of minor versions like \c 4.0-2; <File> is the (relative) +<TypeName> is the type being made available; <InitialVersion> is a version +number like \c 4.0; <File> is the (relative) file name of the QML file defining the type. -The same type can be provided by different files in different versions. -If a type is in multiple major versions, it should be listed on a separate line. + +The same type can be provided by different files in different versions, in which +case later earlier versions (eg. 1.2) must precede earlier versions (eg. 1.0), +since the \e first name-version match is used. Installed files do not need to import the module of which they are a part, as they can refer to the other QML files in the module as relative (local) files. |