aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-061-59/+48
|\
| * Get rid of the old way of defining builtin functionsLars Knoll2017-05-191-59/+48
* | Merge remote-tracking branch 'origin/5.9' into devLars Knoll2017-05-0228-0/+56
|\|
| * Run includemocs in qtdeclarativeThiago Macieira2017-04-2628-0/+56
* | Merge remote-tracking branch 'origin/5.9' into devLars Knoll2017-04-221-0/+7
|\|
| * Silence GCC 7 warnings about implicit fallthrough in Qt codeThiago Macieira2017-04-201-0/+7
* | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-04-071-4/+10
|\|
| * QQuickParticleSystem: Fix crash when an Affector diesMartin T. H. Sandsmark2017-04-051-4/+10
* | Merge remote-tracking branch 'origin/5.9' into HEADSimon Hausmann2017-03-232-2/+14
|\|
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-132-2/+14
| |\
| | * Fix build for -no-feature-quick-shadereffectStephan Binner2017-02-272-2/+14
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-02-283-14/+5
|\| |
| * | Replace usage of QSignalMapper by lambdaOlivier Goffart2017-02-143-14/+5
* | | sources: Add missing override and remove redundant virtualAlexander Volkov2017-02-231-29/+29
|/ /
* | QQuickGravityAffector: Properly deprecate the acceleration property in docsRobin Burchell2017-01-171-7/+5
* | QQuickGravityAffector: Move implementations from header to cppRobin Burchell2017-01-172-37/+46
* | Fix up some last un-fixed instances of qmlInfo that should be qmlWarningRobin Burchell2017-01-161-1/+1
* | Remove remnants of blackberry platform supportRobin Burchell2017-01-163-26/+2
* | Port existing qmlInfo callers to qmlWarningRobin Burchell2017-01-112-5/+5
* | particles: Fix up 16k warnings and apply them on non-ES tooLaszlo Agocs2016-12-212-5/+11
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-11-231-2/+4
|\|
| * Merge remote-tracking branch 'origin/5.7' into 5.8Simon Hausmann2016-11-151-2/+4
| |\
| | * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-151-2/+4
| | |\
| | | * Fix crash when using custom OpenGL functionsJesus Fernandez2016-11-071-2/+4
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-181-3/+4
|\| | |
| * | | QML: Make Heap::Object and all subclasses trivialErik Verbruggen2016-10-061-3/+4
* | | | Particles: add missing 'override'Anton Kudryavtsev2016-10-102-4/+4
* | | | QQuickDirection: drop const from sample() result typeAnton Kudryavtsev2016-10-0610-10/+10
* | | | Particles: add missing 'override'Anton Kudryavtsev2016-10-0622-44/+50
* | | | Mark some methods as constAnton Kudryavtsev2016-10-065-5/+5
* | | | QQuickImageParticle: mark getState() method as staticAnton Kudryavtsev2016-09-201-1/+1
* | | | QQuickLineExtruder: fix function name according to Qt code styleAnton Kudryavtsev2016-09-201-2/+2
|/ / /
* | | Merge dev into 5.8Oswald Buddenhagen2016-08-221-1/+2
|\ \ \
| * | | Particles: fix incorrect usage of 'range for' with Qt containersAnton Kudryavtsev2016-08-201-1/+2
* | | | Have proper OpenGL checks in QQuickFBO and image particlesLaszlo Agocs2016-08-181-0/+10
|/ / /
* | | Private export the Particle EmitterAriel Molina2016-08-121-1/+1
* | | QtQuick: fix use-after-free of shader property connectionsErik Verbruggen2016-07-111-1/+1
* | | QtQuick: clean up shader effect property connectionsErik Verbruggen2016-07-052-8/+13
* | | Merge remote-tracking branch 'origin/dev' into HEADLaszlo Agocs2016-05-241-1/+1
|\| |
| * | V4: allow inlining of ExecutionEngine::{qml,js}Engine()Erik Verbruggen2016-05-201-1/+1
* | | Merge remote-tracking branch 'origin/dev' into wip/scenegraphngLaszlo Agocs2016-05-243-5/+9
|\| |
| * | Particles: Invalidate all group IDs when groups are reset.Erik Verbruggen2016-04-282-3/+9
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-271-2/+0
| |\|
| | * Drop the class name from shader effect material keysUlf Hermann2016-04-201-2/+0
* | | Add the skeleton for the new, more generic shader effect implLaszlo Agocs2016-04-131-0/+1
* | | Prefix GL-specific shader effect codeLaszlo Agocs2016-04-132-21/+21
|/ /
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-081-0/+0
|\|
| * Purge sRGB chunks from PNG.Edward Welbourne2016-03-241-0/+0
* | Replace qQNaN() and friends with qt_qnan().Erik Verbruggen2016-04-051-2/+3
* | Particles: half the number of calls to emittersChanged.Erik Verbruggen2016-03-083-1/+9