aboutsummaryrefslogtreecommitdiffstats
path: root/examples/declarative/ui-components
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in license headers.Jason McDonald2012-01-0517-17/+17
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Examples: Remove commented out 'plugins' list from .qmlproject filesKai Koehne2012-01-044-8/+0
| | | | | Change-Id: I24bacdd52f2f191dde8e0a2fa9718b38ab329597 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Examples: Hard-code the 'main' file in .qmlprojectKai Koehne2012-01-034-4/+12
| | | | | | | | | | | Set the 'mainFile:' property in .qmlproject files where it makes sense (i.e. there's one natural candidate). This makes sure Qt Creator doesn't fall back to 'current file in editor' as main file, which is unexpected to a lot of people. (This requires Qt Creator version 2.2 and newer). Change-Id: Ia5d20b0d982038520d7892bca155267c5f13644b Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update various examples to QtQuick 2.0Damian Jansen2011-09-0297-4540/+17
| | | | | | | | | And remove many duplicate and obsolete files Change-Id: I5416b2b276893d85233918b1a24a30659830d42e Reviewed-on: http://codereview.qt.nokia.com/3623 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Merge branch 'master' into qtquick2Aaron Kennedy2011-06-0987-119/+4523
|\ | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp
| * Doc: Added missing license headers for documentation and examples.David Boddie2011-06-0815-0/+600
| |
| * Removed generated files.David Boddie2011-06-089-144/+0
| |
| * Doc: Added missing project and desktop files.David Boddie2011-05-234-0/+64
| |
| * Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-2389-0/+4957
| |
| * Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-2328-1073/+0
| | | | | | | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
* | Immense Particles Refactor Part DAlan Alpert2011-06-082-3/+3
|/ | | | | | | | | | | | | | | | | | | | Changed the names of several properties: FollowEmitter: emissionShape->emitShape emissionHeight->emitHeight emissionWidth->emitWidth Emitter: particlesPerSecond->emitRate particleDuration->lifeSpan particleDurationVariation->lifeSpanVariation maxParticles->emitCap particleSize->size particleEndSize->endSize particleSizeVariation->sizeVariation ImageParticle: image->source And stopped being silly in the example launcher.
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2745-0/+2436
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12