summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.9.3' into 5.10.0" into refs/sta...v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Antti Kokko2017-11-211-0/+28
|\
| * Merge remote-tracking branch 'origin/5.9.3' into 5.10.0Liang Qi2017-11-211-0/+28
| |\
| | * Add changes file for Qt 5.9.3v5.9.3Antti Kokko2017-11-101-0/+28
* | | Add changes file for Qt 5.10.0Antti Kokko2017-11-211-0/+87
|/ /
* | Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-2066-538/+2162
|\ \
| * \ Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging...Laszlo Agocs2017-11-189-1/+32
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.9' into 5.10Andy Nichols2017-11-179-1/+32
| | |\ \
| | | * | Fix for uniform arrays on some driversPaul Lemire2017-11-175-0/+15
| | | * | Material dirty only on param name/enabled changeSvenn-Arne Dragly2017-11-151-1/+4
| | | * | Fix AnimationClip crash when removing clipsAndy Nichols2017-11-153-0/+13
| * | | | Fix controls example to look betterSean Harmer2017-11-171-2/+14
| * | | | Use texture() GLSL function rather than texture2D() in core profileSean Harmer2017-11-171-1/+1
| |/ / /
| * | | Split animation callback handling into its own frontend classSean Harmer2017-11-1612-74/+586
| * | | Fix layer filter manual testPaul Lemire2017-11-161-2/+2
| * | | Fix: run filterlayerjob when enabled changes on EntitiesPaul Lemire2017-11-161-4/+10
| * | | Fix rendering following LayersDirtyPaul Lemire2017-11-167-215/+432
| * | | Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging...Lars Knoll2017-11-1521-246/+331
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/5.9' into 5.10Svenn-Arne Dragly2017-11-1521-246/+331
| | |\| |
| | | * | Add layer entity filter cachingSvenn-Arne Dragly2017-11-1410-13/+149
| | | |/
| | | * Rework resource handlingLars Knoll2017-11-076-234/+162
| | | * Deal with trailing spaces and crlfKevin Ottens2017-11-074-1/+40
| * | | Set the mapping type in tst_findrunningclipanimatorjobsSvenn-Arne Dragly2017-11-151-0/+1
| * | | Test if m_mappingType is properly initialized in tst_channelmappingSvenn-Arne Dragly2017-11-151-0/+4
| * | | Make sure m_mappingType is initialized in ChannelMappingSvenn-Arne Dragly2017-11-151-0/+1
| * | | Replace all phong variants with QDiffuseSpecularMaterialKevin Ottens2017-11-1513-10/+759
| |/ /
| * | Remove unnecessary list searchesChristian Strømme2017-11-141-8/+12
| * | Reserve vector size ahead of time in the AttachmentPack classChristian Strømme2017-11-141-0/+2
| * | Use std::move when returning the dirty buffers listChristian Strømme2017-11-141-3/+1
| * | Fix warnings caused by QClipAnimator calling QNode::sceneChangeEventAndy Nichols2017-11-141-1/+2
| * | Blacklist filtercompatiblerechniquejob autotestMäättä Antti2017-11-081-3/+4
* | | Fix resource init namespace issuesLaszlo Agocs2017-11-143-9/+24
* | | Fix BC with QRenderCaptureMäättä Antti2017-11-132-7/+28
* | | Fix material system qrc in static buildsLaszlo Agocs2017-11-083-0/+11
|/ /
* | Add missing layer to the baseColorMap nodeKevin Ottens2017-11-071-0/+1
* | Update to new QRandomGenerator APIv5.10.0-beta4Thiago Macieira2017-11-031-1/+1
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-3120-29/+482
|\|
| * Fix SortPolicy sorting key generationLaszlo Agocs2017-10-203-4/+29
| * Doc: Add doc for undocumented methodsNico Vertriest2017-10-201-0/+6
| * Doc: add doc to undocumented methods/propertiesNico Vertriest2017-10-205-4/+346
| * Doc: add doc to undocumented classesNico Vertriest2017-10-205-1/+21
| * Blacklist checkRunRendererRunning in WindowsTony Sarajärvi2017-10-201-0/+2
| * Blacklist tst_FilterCompatibleTechniqueJob in WindowsTony Sarajärvi2017-10-191-0/+2
| * tst_FilterCompatibleTechniqueJob: Fix crash on Open GL context creation failureFriedemann Kleint2017-10-181-3/+12
| * Examples: Fix outdated BSD license headerKai Koehne2017-10-131-2/+12
| * Render next frame if texture data is not availableHarald Vistnes2017-10-093-3/+11
| * Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-063-2/+41
| |\
| | * Add changes file for Qt 5.9.2v5.9.2Antti Kokko2017-09-281-0/+39
| | * Make m_pressAndHoldTimer into a raw pointer to avoid deleting it twiceSvenn-Arne Dragly2017-09-282-2/+2
| * | Bump versionOswald Buddenhagen2017-10-061-1/+1
| * | Fix race in rendererPaul Lemire2017-10-061-10/+0