aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles
Commit message (Expand)AuthorAgeFilesLines
* CMake: Regenerate and adapt to merge from devwip/cmakeAlexandru Croitor2020-03-121-2/+2
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-1233-14/+51
|\
| * Fix all import versionsUlf Hermann2020-02-191-1/+1
| * Add major version to all Q_REVISIONsUlf Hermann2020-02-1928-0/+28
| * Quick: Don't qualify OpenGL includes (part two)Johan Klokkhammer Helsing2020-02-181-1/+1
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-173-12/+21
| |\
| | * Use the extended QQmlListProperty interface in a few placesUlf Hermann2020-02-072-5/+12
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-061-7/+7
| | |\
| | | * Fix static builds due to name clashesAndy Shaw2020-01-311-7/+7
| | * | Synthetically reference type registration functionsUlf Hermann2020-02-041-0/+2
* | | | Regenerate qtdeclarativeAlexandru Croitor2020-02-121-1/+1
* | | | Regenerate projects to handle private deps correctlyAlexandru Croitor2020-02-051-6/+1
* | | | Post-merge fixesAlexandru Croitor2020-01-301-2/+2
* | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-01-2912-2/+2
|\| | |
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-2510-0/+0
| |\| |
| | * | Upgrade qsb files to version 4Laszlo Agocs2020-01-2110-0/+0
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-201-1/+1
| |\| |
| | * | QQmlListProperty: Add replace and removeLast functionsUlf Hermann2020-01-151-1/+1
| * | | Drop all the .2 from import directoriesUlf Hermann2020-01-171-1/+1
* | | | QML Type Registrar changesLeander Beernaert2020-01-241-0/+10
* | | | Post merge fixesLeander Beernaert2020-01-241-0/+4
* | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2020-01-1617-96/+67
|\| | |
| * | | Fix maximum minor to 15 for importsUlf Hermann2020-01-141-1/+1
| |/ /
| * | Generate registrations for all importsUlf Hermann2020-01-102-42/+6
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-092-51/+36
| |\|
| | * Stabilize QQuickItemParticleLouis du Verdier2020-01-072-46/+32
| * | Add QQuickItemParticle give() method bodyFabio Falsini2020-01-062-6/+21
| * | Regenerate rhi shadersLaszlo Agocs2019-12-1110-0/+0
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-092-1/+8
| |\|
| | * Particle system: fix infinite loop after running for many hoursYulong Bai2019-12-062-1/+8
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2019-11-221-1/+1
| |\|
| | * Doc: Fix documentation warningsTopi Reinio2019-11-111-1/+1
* | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-252-2/+17
|\| |
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-162-2/+17
| |\|
| | * Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-152-2/+17
| | |\
| | | * Fix image particle flickering due to broken state machine logicLaszlo Agocs2019-10-142-2/+17
* | | | Regenerate all projects with new CMake API versionAlexandru Croitor2019-11-151-6/+6
* | | | Regenerate projectsAlexandru Croitor2019-11-141-1/+0
* | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-1435-66/+119
|\| | |
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-084-6/+6
| |\| |
| | * | Small performance improvements suggested by clang-tidyAlbert Astals Cid2019-10-074-6/+6
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-044-24/+33
| |\| |
| | * | Change const ref to ref in QSGMaterialRhiShader as per API reviewLaszlo Agocs2019-09-231-10/+10
| | * | Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-09-123-14/+23
| | |\|
| | | * Doc: Fix documentation warnings for qtdeclarativeTopi Reinio2019-08-293-14/+23
| * | | Specify parameters of type registration in class declarationsUlf Hermann2019-09-2629-36/+80
| |/ /
* | | Regenerate the necessary bits of qtdeclarative after wip/qt6 mergeAlexandru Croitor2019-10-141-0/+10
* | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-10-1118-147/+884
|\| |
| * | Make ImageParticle functional when rendering via the RHILaszlo Agocs2019-08-2218-147/+884
* | | Regenerate qtdeclarative before mergeAlexandru Croitor2019-10-111-17/+33