summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* AssimpImporter: remove unused QMapMarc Mutz2019-07-221-2/+0
* Remove unused <QMap> includesMarc Mutz2019-07-222-2/+0
* Remove unused file gltfparser.cppMarc Mutz2019-07-181-1560/+0
* Fix following recent Scene3DRenderer changesPaul Lemire2019-07-161-0/+1
* Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-162-2/+3
|\
| * Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-162-2/+3
|/|
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-111-2/+2
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-111-2/+2
| | |\
| | | * Document unit for FrameAction::triggeredMichael Brasser2019-07-031-2/+2
| | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| * | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| |/ /
* | | Fix compilation with -qt3d-profile-jobsPaul Lemire2019-07-151-1/+1
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-115-49/+157
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-115-49/+157
| |\| |
| | * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-285-49/+157
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-275-49/+157
| | |/| | | | | |/
| | | * Doc: Update code samples in 'Qt 3D Render Framegraph' documentationTopi Reinio2019-06-171-47/+81
| | | * Doc: Extend Qt3D documentationPaul Wicking2019-06-073-2/+56
| | | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | | |/|
| | | | * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-231-0/+20
| | | | * Merge 5.12 into 5.12.4Frederik Gladhorn2019-05-273-2/+95
| | | | |\
| | | | * | Bump versionFrederik Gladhorn2019-05-231-1/+1
* | | | | | Basic KTX support for Qt 3DMichael Brasser2019-07-093-10/+173
* | | | | | QShaderImage: fix missing endtable in docPaul Lemire2019-07-091-1/+1
|/ / / / /
* | | | | Unblacklist passingDaniel Smith2019-06-271-4/+2
* | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-256-13/+118
|\ \ \ \ \
| * | | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-256-13/+118
|/| | | | | | |/ / / /
| * | | | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+26
| |\ \ \ \
| | * | | | Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+26
| |/| | | |
| | * | | | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0Antti Kokko2019-05-101-0/+26
| * | | | | Add doc to undocumented functions qt3dNico Vertriest2019-05-275-13/+92
* | | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-187-6/+368
|\ \ \ \ \ \
| * | | | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-187-6/+368
|/| | | | | | | |/ / / / /
| * | | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-157-6/+368
| |\ \ \ \ \
| | * | | | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-157-6/+368
| |/| | | | | | | | |/ / / | | |/| | |
| | * | | | Fix removal of components when they are destroyedMike Krus2019-05-285-3/+44
| | * | | | Fix Parameter priority sortingPaul Lemire2019-05-242-3/+324
* | | | | | Convert uses of QTime as a timer to QElapsedTimerEdward Welbourne2019-06-121-3/+4
* | | | | | Replace QLatin1Literal with QLatin1StringGiuseppe D'Angelo2019-06-117-30/+30
* | | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Paul Lemire2019-06-03112-25397/+1131
|\ \ \ \ \ \
| * | | | | | Merge remote-tracking branch 'origin/5.13' into devPaul Lemire2019-06-03112-25397/+1131
| |\| | | | |
| | * | | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Liang Qi2019-05-2970-25104/+12
| | |\ \ \ \ \
| | | * | | | | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-05-2970-25104/+12
| | |/| | | | | | | | |/ / / /
| | | * | | | Clean up warningsMike Krus2019-05-285-11/+13
| | | * | | | Remove assets that are no longer usedDmitry Shachnev2019-03-2366-25093/+0
| | * | | | | Merge "Merge branch '5.12' into 5.13"Paul Lemire2019-05-281-1/+1
| | |\ \ \ \ \
| | | * | | | | Merge branch '5.12' into 5.13Paul Lemire2019-05-281-1/+1
| | |/| | | | | | | | |/ / / /
| | | * | | / QClearBuffers: fix wrong clearColor qml property name in docPaul Lemire2019-05-241-1/+1
| | | | |_|/ | | | |/| |