Commit Graph

8 Commits

Author SHA1 Message Date
Aaron Kennedy 9bcea0318c Merge branch 'master' into qtquick2
Conflicts:
	src/declarative/qml/qdeclarativeengine.cpp
2011-06-09 14:45:59 +10:00
David Boddie b8154d2b6b Doc: Added missing license headers for documentation and examples. 2011-06-08 18:20:14 +02:00
David Boddie d25ca41d90 Removed generated files. 2011-06-08 18:20:14 +02:00
Alan Alpert c8a5c00ec1 Immense Particles Refactor Part D
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.
2011-06-08 18:03:39 +10:00
David Boddie f766a992b1 Doc: Added missing project and desktop files. 2011-05-23 14:27:59 +02:00
David Boddie 6146287cb3 Squashed commit of changes from the 4.8-temp branch. 2011-05-23 14:27:59 +02:00
David Boddie 36dfaf4bb3 Squashed commit of the changes from the mobile-examples repository
(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
2011-05-23 14:27:58 +02:00
Qt by Nokia 885735d011 Initial import from the monolithic Qt.
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
2011-04-27 12:05:43 +02:00