| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
| |
Change-Id: I24bacdd52f2f191dde8e0a2fa9718b38ab329597
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| |
| | |
Conflicts:
src/declarative/qml/qdeclarativeengine.cpp
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
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
|