summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-256-32/+1586
|\
| * remove dependencies from sync.profileOswald Buddenhagen2016-11-061-13/+0
| * QFixedFrameAllocator: Extract Method scan()Marc Mutz2016-10-242-17/+25
| * QRenderAspect: remove misleading checkMarc Mutz2016-10-241-1/+1
| * Merge fix for tst_renderqueue::concurrentQueueAccess autotest to 5.6Milla Pohjanheimo2016-10-191-14/+7
| * GLTFIO: check return value of QFile::open()Marc Mutz2016-10-051-6/+4
| * remove pointless load(qt_build_paths)Oswald Buddenhagen2016-10-041-1/+0
* | Merge remote-tracking branch 'origin/5.7.1' into 5.7Liang Qi2016-11-2411-43/+73
|\ \
| * | NodeInstantiator created nodes go to its parentv5.7.1Kevin Ottens2016-10-147-38/+60
| * | Give access to FrameGraphNode as a grouping nodeKevin Ottens2016-10-144-5/+13
* | | Readd doc that was removed by e3c70ea206eaef9fe310ebc880070b173977530eAndy Shaw2016-11-181-0/+21
* | | Remove old deferred-renderer-cppJoni Poikelin2016-11-1719-944/+0
* | | Update docs for render states part 2Antti Määttä2016-11-1410-198/+559
* | | Update docs for render statesAntti Määttä2016-11-1411-117/+436
* | | Update QComputeCommand and QDispatchCompute docsAntti Määttä2016-11-142-29/+95
* | | Update QFrustumCulling docsAntti Määttä2016-11-141-9/+24
* | | Update docs for render targetsAntti Määttä2016-11-143-81/+215
* | | Fix Clang warning about overwriting a vtableThiago Macieira2016-11-021-4/+4
* | | Move struct Entry outside class ByteArraySplitterMika Salmela2016-11-011-7/+8
* | | Fix NodeInstantiator::objectAdded docsDaniel Vrátil2016-11-011-2/+2
* | | GraphicsContext: remove misleading check in specifyAttribute()Marc Mutz2016-10-241-1/+1
* | | UpdateAxisActionJob: remove misleading redundant checkMarc Mutz2016-10-111-3/+2
* | | Doc: Fix QT variable value for Qt Quick apps on front pageLeena Miettinen2016-10-111-1/+1
* | | Merge branch '5.7.1' into 5.7Sean Harmer2016-10-1030-198/+915
|\ \ \ | |/ /
| * | Fix orientation of textures on planes in audio vis exampleSean Harmer2016-10-102-0/+0
| * | Add unit test for QTorusGeometrySean Harmer2016-10-104-42/+438
| * | Factor out the geometry test helper functionsSean Harmer2016-10-104-71/+114
| * | Silence some warnings in tests with MSVC2015Sean Harmer2016-10-108-22/+22
| * | Fix off by one error in torus texture coordinate generationSean Harmer2016-10-101-1/+1
| * | Add tangent attribute to torus geometrySean Harmer2016-10-102-4/+25
| * | Put uv seam on inner ring of torusSean Harmer2016-10-101-5/+5
| * | Unit Tests for QAbstractPhysicalDeviceBackendNodePaul Lemire2016-10-103-1/+259
| * | Export AxisSetting for unit testsPaul Lemire2016-10-101-1/+1
| * | QAbstractPhysicalDeviceBackendNode: remove assert that conflicts with testsPaul Lemire2016-10-101-1/+0
| * | QAbstractPhysicalDeviceBackendNode: fix bad erasePaul Lemire2016-10-101-1/+3
| * | Merge 5.7 into 5.7.1Oswald Buddenhagen2016-10-0618-194/+1650
| |\ \ | |/ / |/| |
* | | ShaderData: fix unnecessary cast between enumsMarc Mutz2016-10-051-1/+1
* | | Have sane default for QButtonAxisInput::scaleKevin Ottens2016-09-283-1/+17
* | | Lights should respect the enabled flagKevin Ottens2016-09-281-0/+3
* | | qgltf: eradicate all Q_FOREACH loopsMarc Mutz2016-09-272-50/+65
* | | qgltf: replace some QStringLiteral with QLatin1StringMarc Mutz2016-09-271-3/+3
* | | FrameGraphNode: properly handle dynamic tree changesPaul Lemire2016-09-273-3/+157
* | | Update QML type information for Qt CreatorKevin Ottens2016-09-266-135/+1393
* | | Add namespace to picking settings property typeKevin Ottens2016-09-261-1/+1
* | | Basic shapes example is dark with default lightKevin Ottens2016-09-261-0/+10
| * | QEntity::createNodeCreationChange fixPaul Lemire2016-10-054-47/+49
| * | Fix initialization of loop variables in lighting shadersTim Blechmann2016-10-042-8/+4
|/ /
* | QTechnique fix: was sending wrong change typePaul Lemire2016-09-191-1/+1
* | Update QClearbuffers docsAntti Määttä2016-09-091-25/+31
* | Fix QCameraLens moduleAntti Määttä2016-09-091-2/+2