summaryrefslogtreecommitdiffstats
path: root/src/quick3d
Commit message (Expand)AuthorAgeFilesLines
* Make sure right screen is set on QOpenGLContext and QOffscreenSurfaceAndy Shaw2019-10-102-0/+8
* Clarify Scene2D input event supportTomi Korpipaa2019-10-071-0/+4
* Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-05-291-7/+7
|\
| * Clean up warningsMike Krus2019-05-281-7/+7
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-265-3/+98
|\|
| * Update Qt3D color handlingMichael Brasser2019-05-153-2/+95
| * Register Qt3DCore::QNode also for Qt3D.AnimationUlf Hermann2019-05-171-0/+2
| * Doc: Fix missing code snippet in Scene3DTopi Reinio2019-05-151-1/+1
* | Merge remote-tracking branch 5.12 into 5.13Paul Lemire2019-04-261-3/+0
|\|
| * Cleanup debug output in Quick3DEntityLoaderPrivateJ-P Nurmi2019-04-181-3/+0
* | Switch export macros to standard formKai Koehne2019-04-0264-96/+96
* | Merge branch '5.12' into 5.13Paul Lemire2019-04-022-16/+35
|\|
| * Revert "Scene3D: Call update on the item not the window"Paul Lemire2019-03-281-1/+1
| * Scene3D: Call update on the item not the windowAnton Kreuzkamp2019-03-211-1/+1
| * Expand Scene3D documentationMichael Brasser2019-03-201-16/+28
| * Always load scene2d render plugin in static buildsAnton Kreuzkamp2019-02-221-0/+7
* | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-078-19/+230
* | QML: Fix registration of ShaderProgramBuilderKai Koehne2019-03-071-1/+1
* | Suppress warning about cast across function typesThiago Macieira2019-02-271-0/+3
* | Suppress warning about deprecated class QTexturedMetalRoughMaterialThiago Macieira2019-02-091-0/+3
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-092-2/+13
|\|
| * Fix opacity for Scene3DMichael Brasser2019-02-081-2/+4
| * Fix scene2d starting trigger when setting item lateMäättä Antti2019-02-061-0/+9
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-023-2/+4
|\|
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-1/+1
| |\
| | * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-082-1/+14
| | |\
| | * | Fix sourceComponent property of EntityLoaderFriedemann Kleint2019-01-031-1/+1
| * | | Always export scene2d shared objectMäättä Antti2019-01-311-1/+1
| * | | Add revisioned QML registrations for QAttributeMichael Brasser2019-01-311-0/+2
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-252-1/+14
|\| |
| * | Fix loading of animation aspect on iOSMike Krus2018-12-202-1/+14
| |/
* | Register revision 13 of QObjectPicker to QMLPaul Lemire2018-12-211-0/+1
* | QShaderProgramBuilder: add properties to access generated shader codePaul Lemire2018-12-141-0/+1
* | QComputeCommand allow to control the run behaviorPaul Lemire2018-11-141-0/+1
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-031-0/+5
|\|
| * Doc: Add doc to undocumented methodsNico Vertriest2018-11-011-0/+5
* | Register QWaitFence/QSetFence with QML modulePaul Lemire2018-10-111-0/+4
* | Merge branch '5.12' into devSean Harmer2018-10-1118-924/+1664
|\|
| * Update plugins.qmltypesv5.12.0-beta2Kai Koehne2018-10-0915-894/+1632
| * Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-053-30/+32
| |\
| | * Scene3D crashing on destructionMichael Dippold2018-09-273-30/+32
* | | QAbstractTexture:: add handle and handleType propertiesPaul Lemire2018-10-101-0/+1
* | | Register QSharedGLTexture to qmlPaul Lemire2018-10-081-0/+1
|/ /
* | Replace use of qmlRegisterRevisionKai Koehne2018-10-041-1/+1
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-223-15/+14
|\|
| * Replace use of qmlRegisterRevisionKai Koehne2018-09-203-15/+14
* | Quick3DEntityLoaderPrivateSubject: Fix warning about unused variableFriedemann Kleint2018-09-171-2/+0
* | Automatically register the latest import versionKai Koehne2018-09-0616-8/+32
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-041-1/+1
|\|
| * Qt3DWindow/Qt3DQuickWindow base custom surface format on default onePaul Lemire2018-08-291-1/+1