aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into qtquick2Gunnar Sletta2011-05-042-1/+3
|\ | | | | | | | | Conflicts: src/imports/particles/particles.pro
| * Use private headersMarius Storm-Olsen2011-05-022-2/+2
| |
* | Affector AugmentationAlan Alpert2011-05-036-10/+60
| | | | | | | | | | | | Affectors gained shape and signal properties, and the affected(x,y) signal (turned on by the signal property, a theorized performance improvement).
* | Update particles to use QElapsedTimerAlan Alpert2011-04-287-11/+10
| | | | | | | | | | | | | | | | Step one of fixing the limited lifetime bug. As this step should also increase the lifetime 'a lot' step two may take a while. Change-Id: I87bbe762803451f751e23d4bf8559c662fdf57a3 (cherry picked from commit 9cf15c135373f8190bf2cb62f9f99890cacf7d88)
* | Add variable rotation speed to deformable particleAlan Alpert2011-04-283-6/+45
| | | | | | | | | | Change-Id: I105f18f0d7ec860de5d8bc8a9f3e4f007ea71ae2 (cherry picked from commit 41296b3ed046ddf73eca320bf0a97008decca287)
* | Merged master into qtquick2.axis2011-04-274-6/+8
|\|
| * Switched to using QT.declaratice.imports variable.axis2011-04-274-4/+4
| |
| * compile qtdeclarative/importOlivier Goffart2011-04-271-2/+4
| |
* | Initial import from qtquick2.Qt by Nokia2011-04-27110-22/+13093
|/ | | | | Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2717-0/+2921
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