summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-162-2/+3
| |/| | | | | |/ / | | | | | | | | Change-Id: Ibc90d50504e250a6f90f1c6f179c41cafb7f908b
| | * | 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
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iabe445fa892f2022aa1e58d1783a2d588d6b6a87
| | | | * Document unit for FrameAction::triggeredMichael Brasser2019-07-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-74165 Change-Id: I4d3de42cddd8f6e1e6729cc16a52e135ab7fa3b1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9e9da54e565ad7818e6ea8196a062af8b4931783
| | * | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: Iec111e88d38fb9a143a60a647251601f331fc41e Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | | Fix compilation with -qt3d-profile-jobsPaul Lemire2019-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Which otherwise fails following the introduction of ShaderImage Change-Id: Ie41057974cef133e4e9b9718df370b82ee7d3d65 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | | Merge "Merge remote-tracking branch 'qt-gerrit/dev' into wip/refactor"Paul Lemire2019-07-16194-25691/+5684
|\ \ \ \
| * | | | Merge remote-tracking branch 'qt-gerrit/dev' into wip/refactorPaul Lemire2019-07-15194-25691/+5684
|/| | | | | |/ / / | | | | | | | | Change-Id: I75abb23476585050187caf9490606e60c850ce4f
| * | | 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
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id34a7e40a1bd8f5bfbf87d3f3c06129bdfaebdf1
| | | * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iff6e240187e3515a51f41a91da827d4a53c01a31
| | | * | 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
| | | |/| | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iae5fa92dfdf8012315c043e20950368e42451e20
| | | | * Doc: Update code samples in 'Qt 3D Render Framegraph' documentationTopi Reinio2019-06-171-47/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code snippets were outdated, referring to QML properties that do not exist. In particular, the Deferred Rendering section contains code that was based on an example that's since moved into tests. Adapt the code to match the updates done to that example and also mention where it originates from. Task-number: QTBUG-73024 Change-Id: I9ec750d05f8e853e5614f33dadcbe44a0b42e356 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | | | * Doc: Extend Qt3D documentationPaul Wicking2019-06-073-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds missing C++ and/or QML documentation for: * enum QBuffer::AccessType * QBuffer::accessType() * QBuffer::dataAvailable() * ForwardRenderer::externalRenderTargetSize * enumeration Qt3D.Render.Light::type * Qt3D.Render.Light::color * Qt3D.Render.Light::intensity Fixes: QTBUG-73071 Change-Id: I48b13cb8001558b20bd801b6f96f5b5933144d82 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | | | * 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
| | | | |/| | | | | | | | | | | | | | | | | | | Change-Id: I871b54c0af70d568a489416db859e827d865c273
| | | | | * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I639e7fd3ee6df52b10195b2e183bb46c4380350d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | | | | * Merge 5.12 into 5.12.4Frederik Gladhorn2019-05-273-2/+95
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | Change-Id: I43d66c3533ee546f40c1a1373717721b48fcd23b
| | | | | * | Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibfc879d78837fb297244384deef0bff699a3b105
| * | | | | | Basic KTX support for Qt 3DMichael Brasser2019-07-093-10/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adapt the KTX loading code from Qt 3D Studio. Currently only supports a limited subset of texture types. [ChangeLog] Add basic support for KTX container format. Change-Id: Iccad368ed5db571f1f896fb77889db16b8d4b794 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | | | | | QShaderImage: fix missing endtable in docPaul Lemire2019-07-091-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00539700feddfd69b8486838240935109d24457f Reviewed-by: Michael Brasser <michael.brasser@live.com>
| * | | | | Unblacklist passingDaniel Smith2019-06-271-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unblacklist tests on platforms that have not failed in at least 60 days Change-Id: I5e8aba474f14e8d333f9d6d29b57e07476c7896e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * | | | | 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
| |/| | | | | | | |/ / / / | | | | | | | | | | | | Change-Id: Ib1f5677a99f63b15c3990fea130c8bbe946f31ff
| | * | | | 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
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ded63bf4c8f08f363327ab6297d0b7f59d4e39d
| | | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I81f5367a391bc80f83ed4648a89cafc8ab379671 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * | | | | Add doc to undocumented functions qt3dNico Vertriest2019-05-275-13/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic5183b31ee0df54e7a99a48f71ac04fc648f92e2 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * | | | | | 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
| |/| | | | | | | | |/ / / / / | | | | | | | | | | | | | | Change-Id: I942a33e63084b346702577e28c70f2111e40a4d5
| | * | | | | 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
| | |/| | | | | | | | | |/ / / | | | |/| | | | | | | | | | Change-Id: I903f92a7b910eee165a2dd708a2d5fb25192ab14
| | | * | | | Fix removal of components when they are destroyedMike Krus2019-05-285-3/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic removal of components when they are destroyed is based on connecting to the destroyed() signal. This however means that by the time removeComponent() is called, the pointer is no longer a valid QComponent (just a QNode). While accessing member data of derived classes such as nodeId is fine, emitting signals from derived class does nothing, and in some cases asserts. Fix this by: - doing the QComponent clean up from it's destructor - implementing a separate method on QEntity to simply clear the now partly invalid pointer from the list. Change-Id: Id7632ee2ceaff6548c44c7a43ae40a0372febde9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | | * | | | Fix Parameter priority sortingPaul Lemire2019-05-242-3/+324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parameters defined on an effect have priority over those defined in a Technique. Change-Id: I49558a065b613d7ea9d1cbf0a64f6d5aad941cd3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | | | | | Convert uses of QTime as a timer to QElapsedTimerEdward Welbourne2019-06-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifecc9e20f6e2a4adf6811b38c8afdc830ecd91cf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | | | | | Replace QLatin1Literal with QLatin1StringGiuseppe D'Angelo2019-06-117-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QLatin1Literal is an undocumented and deprecated typedef for QLatin1String, just use the original. Change-Id: Id6a813ed5c0a457f003dbd118b64f77d9d82cb13 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | | | | | 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
| |/| | | | | | |/| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/render/renderers/opengl/renderer/renderer.cpp tests/auto/render/textures/tst_textures.cpp Change-Id: I4da0eafe7ddd4dd822c3dcb5f5fa826653a335b4
| | * | | | | 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
| | |/| | | | | | | | |/ / / / | | | | | | | | | | | | | | Change-Id: I9e9214906c5cda56d0bcc98678c77be69189699d
| | | * | | | Clean up warningsMike Krus2019-05-285-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ddad305359586481021e85f6e4a470d3a6521b0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | | * | | | Remove assets that are no longer usedDmitry Shachnev2019-03-2366-25093/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Files chest.qrc, houseplants.qrc and metalbarrel.qrc which used these assets were removed in commit 74c06c02f896c6aba408cfd0857d317378572736. Change-Id: Idd8d5b9baedf4c8f608aff6e3b5dbfe1a4f5a25e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * | | | | 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
| | |/| | | | | | | | |/ / / / | | | | | | | | | | | | | | Change-Id: I8be64f0e027454e062383a13f3140dbc6df83336
| | | * | | / QClearBuffers: fix wrong clearColor qml property name in docPaul Lemire2019-05-241-1/+1
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | Change-Id: I22ee256f266cb3359d1666e831d37b804d80d55a Reviewed-by: Mike Krus <mike.krus@kdab.com>
| | * | | | Clean up bounding box updatesMike Krus2019-05-251-37/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use EntityAccumulator to collect all entities and use a single map/reduce call. This avoid allocations due to getting entity children and locking due to using one map/reduce per entity previously. Change-Id: Iac8eb315bfb302bc68dbdfc961bbc48beb8cd19a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * | | | Introduce EntityAccumulatorMike Krus2019-05-254-1/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used to traverse scene graph (using EntityVisitor) and collect list of entity matching a predicate. By default, collects all entities, but can also collect those that have a certain type of component, or use a custom predicate Change-Id: I9da877d629fe146c1307f5afead7502c440aca9f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-05-268-9/+165
| | |\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 08:17:06 +0000