summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qt3dHEADdevQt Submodule Update Bot26 hours1-4/+4
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2 days1-4/+4
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot4 days96-1337/+1607
|\
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-0196-1337/+1607
| |\
| | * Update QAxis to use direct syncMike Krus2019-09-306-72/+35
| | * Enable direct syncing on input aspectMike Krus2019-09-305-0/+164
| | * RenderSurfaceSelector: record window size instead of accessing itPaul Lemire2019-09-301-6/+1
| | * Renderer: remove redundant setter callPaul Lemire2019-09-301-2/+0
| | * Renderer: cache traversal of FrameGraphPaul Lemire2019-09-303-36/+40
| | * Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-09-303-2/+31
| | |\
| | | * Reset input axis changes when enabling camera controllerMike Krus2019-09-302-0/+8
| | | * Doc: Fix documentation issues for Qt3DRender::QTexture* classesTopi Reinio2019-09-271-2/+24
| | * | RenderView:buildDrawRenderCommands: only set Command members that matterPaul Lemire2019-09-303-59/+10
| | * | Update QAbstractRayCaster to use direct syncPaul Lemire2019-09-274-61/+58
| | * | Update QObjectPicker to use direct syncPaul Lemire2019-09-274-42/+44
| | * | Update QShaderProgramBuilder to use direct syncPaul Lemire2019-09-264-124/+114
| | * | Update QShaderProgram to use direct syncPaul Lemire2019-09-264-75/+39
| | * | Update QFilterKey to use direct syncPaul Lemire2019-09-255-46/+49
| | * | Update QShaderImage to use direct syncPaul Lemire2019-09-254-71/+63
| | * | Update QAbstractTextureImage to use direct syncPaul Lemire2019-09-256-101/+113
| | * | Update QComputeCommand to use direct syncPaul Lemire2019-09-256-81/+48
| | * | Update QRenderState to use direct syncPaul Lemire2019-09-2512-229/+216
| | * | Update QRenderSettings to use direct syncPaul Lemire2019-09-257-38/+54
| | * | Update QRenderTargetOuput to use direct syncPaul Lemire2019-09-253-36/+34
| | * | Update QRenderTarget to use direct syncPaul Lemire2019-09-256-70/+43
| | * | Update QSceneLoader to use direct syncPaul Lemire2019-09-254-51/+33
| | * | Update QLevelOfDetailSwitch to use direct syncPaul Lemire2019-09-251-1/+1
| | * | Update QLevelOfDetail to use direct syncPaul Lemire2019-09-254-53/+56
| | * | Update QLayer to use direct syncPaul Lemire2019-09-253-23/+16
| | * | Support transient enablement in QSubtreeEnablerMichael Brasser2019-09-2411-6/+268
| | * | ClearBuffer: properly initialize clear color vectorPaul Lemire2019-09-241-0/+4
| | * | Fix compile warning in imagesubmissioncontext.cppPaul Lemire2019-09-241-1/+3
| | * | Update QCameraLens to use direct syncPaul Lemire2019-09-246-58/+77
* | | | Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot5 days1-4/+4
* | | | Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot8 days1-0/+13
* | | | Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann11 days20-52/+59
|\ \ \ \
| * \ \ \ Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"wip/qt6Alexandru Croitor2019-08-1069-1765/+1499
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/dev' into wip/qt6Alexandru Croitor2019-08-0969-1765/+1499
| | |\ \ \ \ | |/ / / / /
| * | | | | Fix Qt6 buildAlexandru Croitor2019-08-0110-21/+28
| * | | | | Bump Qt version to Qt 6Alexandru Croitor2019-07-1111-32/+32
* | | | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-09-24274-4534/+3525
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-24274-4534/+3525
| |\ \ \ \ \ \ |/ / / / / / / | | | | _ / / | | | | / /
| * | | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-23122-1929/+1131
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-23122-1929/+1131
| | |\ \ \ \ \ | |/ / / / / / | | | | | _ / | | | | | /
| | * | | | Update QChannelMapper to use direct syncMike Krus2019-09-235-64/+34
| | * | | | Update mapping classes to use direct syncMike Krus2019-09-2310-189/+90
| | * | | | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-alpha1Qt Forward Merge Bot2019-09-211-1/+1
| | |\ \ \ \
| | | * \ \ \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-211-1/+1
| | | |\ \ \ \ | | |/ / / / / | | | | | | _
| | | * | | Fix potential memory leakMichael Brasser2019-09-171-1/+1
| | * | | | QFrameGraphNode: remove message sync left oversPaul Lemire2019-09-205-65/+19