aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeengine.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into qtquick2Aaron Kennedy2011-06-091-22/+18
|\
| * Fix docs on caching for images loaded by image providersBea Lam2011-06-071-3/+0
| * Merge branch 'qtquick2'Martin Jones2011-05-311-12/+133
| |\
| * | Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-05-241-17/+17
* | | Immense Particles Refactor Part AAlan Alpert2011-06-071-0/+2
* | | Merge branch 'master' into qtquick2Alan Alpert2011-06-061-18/+21
|\| | | |/ |/|
| * Removed some trailing whitespaceThorbjørn Lindeijer2011-05-101-17/+17
| * Moved the QML Observer Service and related functionality into QtThorbjørn Lindeijer2011-05-101-1/+5
* | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging in...Alan Alpert2011-05-191-3/+0
|\ \
| * | Re-apply "Support mirroring the source rectangle of ShaderEffectSource."Kim Motoyoshi Kalland2011-05-191-3/+0
* | | Normalize createQmlObject error messageAlan Alpert2011-05-191-2/+2
|/ /
* | Revert "Support mirroring the source rectangle of ShaderEffectSource."Chris Adams2011-05-181-0/+3
* | Improve error message for invalid image provider name.Martin Jones2011-05-121-1/+1
* | Augment DocumentationAlan Alpert2011-05-091-0/+2
* | Support mirroring the source rectangle of ShaderEffectSource.Kim Motoyoshi Kalland2011-04-291-3/+0
* | Initial import from qtquick2.Qt by Nokia2011-04-271-4/+128
|/
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+2512