summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* QAbstractTexture: Fix \since for handle, handleTypev5.13.0-beta1Kai Koehne2019-03-071-2/+2
* Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-078-19/+230
* QML: Fix registration of ShaderProgramBuilderKai Koehne2019-03-071-1/+1
* QML: Properly revision new signals and slots in 5.13Kai Koehne2019-03-075-15/+15
* Fix deprecation warnings about setDataType()/setDataSize()Friedemann Kleint2019-03-071-8/+8
* Suppress warning about cast across function typesThiago Macieira2019-02-271-0/+3
* Fix GCC warning about cv qualifiers in castThiago Macieira2019-02-272-2/+2
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-164-18/+37
|\
| * Doc: clarify some propertiesJoni Poikelin2019-02-143-17/+36
| * Enable assimp for gcc 5.x buildsKarim Pinter2019-02-121-1/+1
* | Suppress warning about deprecated class QTexturedMetalRoughMaterialThiago Macieira2019-02-091-0/+3
* | Fix order of initialization in constructor listThiago Macieira2019-02-091-1/+1
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-097-5/+44
|\|
| * Fix Assimp scene loader plugin resource pathsLee Helpingstine2019-02-081-0/+1
| * Fix opacity for Scene3DMichael Brasser2019-02-081-2/+4
| * Fix scene2d starting trigger when setting item lateMäättä Antti2019-02-061-0/+9
| * Qt3D depends on QtGuiLiang Qi2019-02-051-0/+1
| * assimp: Fix warning about uninitalized variableAndy Shaw2019-02-052-3/+28
| * dFdx/dFdy require GL_OES_standard_derivatives under ES 2Michael Brasser2019-02-041-0/+1
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-028-6/+42
|\|
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-012-1/+34
| |\
| | * Add changelog file for Qt 5.12.1v5.12.1Antti Kokko2019-01-171-0/+33
| | * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-0824-41/+284
| | |\
| | * | Fix sourceComponent property of EntityLoaderFriedemann Kleint2019-01-031-1/+1
| * | | Always export scene2d shared objectMäättä Antti2019-01-311-1/+1
| * | | assimp: Provide names for generated child entitiesMichael Brasser2019-01-311-0/+1
| * | | Add revisioned QML registrations for QAttributeMichael Brasser2019-01-311-0/+2
| * | | Doc: Fix external link error for SceneLoaderMichael Brasser2019-01-291-1/+1
| * | | Document that QMetalRoughMaterial has an ES 3 techniqueMichael Brasser2019-01-281-1/+1
| * | | Doc: Add doc to undocumented methods and properties qt3dNico Vertriest2019-01-241-2/+2
* | | | Merge remote-tracking branch 'origin/5.12' into devMike Krus2019-01-234-12/+162
|\| | |
| * | | Avoid repeated warningsMike Krus2019-01-183-4/+153
| * | | Fix issue with invalid texturesMike Krus2019-01-181-8/+9
| * | | Bump versionKari Oikarinen2019-01-141-1/+1
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-109-37/+62
|\| | |
| * | | Fix env-map less renderingMike Krus2019-01-093-28/+7
| | |/ | |/|
| * | Recompute bounding volumes when buffer changesPaul Lemire2019-01-072-1/+4
| * | Picking: viewport contains check needs to use pos in GL coordinatePaul Lemire2019-01-072-5/+32
| * | Bump versionKari Oikarinen2019-01-071-1/+1
| * | QRenderCapture: Prevent crash on shutdown when replies are pendingChristian Andersen2019-01-062-3/+19
* | | QGeometry: add minExtent/maxExtent propertiesPaul Lemire2019-01-078-15/+242
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-011-19/+9
|\| |
| * | configure: adjust to qbase changesOswald Buddenhagen2018-12-311-13/+9
| * | configure: don't add system default library locations to fbxOswald Buddenhagen2018-12-311-6/+0
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-2515-12/+199
|\| |
| * | texture_property_updates test: specify texture formatPaul Lemire2018-12-211-0/+2
| * | Fix loading of animation aspect on iOSMike Krus2018-12-203-1/+15
| * | QEnvironmentLight: add uniforms for envmaps sizePaul Lemire2018-12-204-6/+147
| * | QEnvironmentLight: fix wrong getter callPaul Lemire2018-12-191-1/+1
| * | Texture: initialize internal format to NoFormatPaul Lemire2018-12-196-5/+28