aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/particles
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Changed the title to avoid name conflicts and linking errorsVenu2013-06-182-2/+2
| | | | | | | | | Task-number: QTBUG-30173 Change-Id: Ibf6626cdfc205c48ca634491661c87414bbddf24 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Fix some broken snippet pathsSze Howe Koh2013-05-065-40/+40
| | | | | Change-Id: Ib79bfbea402b86e26a503de47383522317ca906b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Qt Quick: Fix module name format (Pt 1/2)Sze Howe Koh2013-04-231-1/+1
| | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Attempt to differentiate between the whole module ("Qt Quick") and the QML import ("QtQuick") by encoding the latter with monospace font. There are places in the text where both representations are valid. Change-Id: Id6e157a4191aaa4e23a9cd5c76abfe902fe43d33 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-035-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Doc: Spelling fix.v5.0.2Jerome Pasion2013-03-261-2/+1
| | | | | | | | | | | | | | "sufficent" -> "sufficient" Change-Id: Id46e15c3fb0a2514e8a391108065a52a18da6936 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Fix duplicate examples for qml/quick modulesKai Koehne2013-03-215-5/+5
| | | | | | | | | | | | Task-number: QTBUG-30233 Change-Id: Ic0a6d9112dbf8903d68f571e0ac853d89ff31ebe Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: Fix some titles and linksSze Howe Koh2013-03-305-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make page titles follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation. Make class/type list titles follow the "<Qt Module> C++ Classes" and "<Qt Module> QML Types" formats. Links are updated accordingly, along with broken links found during this sweep. Some inline links also have their surrounding text modified, to improve flow. Change-Id: I0ed7788caa250085d7ea0080a77d8a2655debf39 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Doc: Fixed some uses of terminolgies in qdoc files.Jerome Pasion2013-03-264-12/+10
|/ | | | | | | | | | | -"element" -> "type" or "object" (not in all cases where this change applies) -some instances of QtQuick. It should be "Qt Quick". -only in qdoc files. Examples and source code changes will be done later. Task-number: QTBUG-30180 Change-Id: Ie587461a138e97606f761ad1e90909c91b479303 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Merge branch 'release' into stableSergio Ahumada2013-01-312-1/+2
|\ | | | | | | Change-Id: Ic270f7814489b2c7df7e0f1ecb46cd516802cac5
| * Doc: corrected path to snippetNico Vertriest2013-01-281-1/+1
| | | | | | | | | | | | | | | | Added "quick" to path in imageparticle.qdoc Task-number: QTBUG-29101 Change-Id: If328cde08f46b720defa1953916753ba9d9836a8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * mark forgotten EXAMPLE_FILESOswald Buddenhagen2013-01-281-0/+1
| | | | | | | | | | Change-Id: I83c7706479ea3afd45ab9c97f63f68d416b28f55 Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Update copyright year in Digia's license headersSergio Ahumada2013-01-1054-54/+54
| | | | | | | | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Doc: Updated docs for examples and etcXingtao Zhang2013-01-095-44/+44
|/ | | | | | | | | | | | - Corrected several \snippet paths and \example paths. - Added missing example images. - Marked several commands as code. - Updated the exampledirs variable for qtqml. Done-with: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Task-number: QTBUG-28898 Change-Id: I24aac17821f54de4bd5129c45b5bf96dc0f114b2 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Use resource files for most examplesKai Koehne2012-12-1216-20/+127
| | | | | | | | | Make examples shadow-build-friendly by using resource files instead of trying to derive the qml path from applicationDirPath(). Change-Id: I669424554c772d9b261249b366247190f5fbd8b1 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Examples: Remove unused import "../shared"Kai Koehne2012-12-111-1/+0
| | | | | Change-Id: I3c84eab1ff97380362828aa96b0d5189cbd62509 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* centralize and fixup example sources install targetsOswald Buddenhagen2012-12-10106-0/+6083
follow respective change in qtbase Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>