summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.4.2' in qt/qt3dv6.4.26.4.2Qt Submodule Update Bot2022-12-121-4/+4
| | | | | Change-Id: I754f59941de79018aece1bb24fab15b33d9c29a9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.2' in qt/qt3dQt Submodule Update Bot2022-12-091-4/+4
| | | | | Change-Id: Ib634409359e343d8151e4c5d0b0991559843c150 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.2' in qt/qt3dQt Submodule Update Bot2022-12-071-4/+4
| | | | | Change-Id: I7c78911a68dbd8012aa7b275744ec4d7977c383b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.2' in qt/qt3dQt Submodule Update Bot2022-12-061-1/+1
| | | | | Change-Id: Ia5e43d9def3742424331cd5037edd9e8577403f9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.2' in qt/qt3dQt Submodule Update Bot2022-12-051-4/+4
| | | | | Change-Id: I5f68757819525b565415367eb1c4b9cfaabab7b9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-12-011-4/+4
| | | | | Change-Id: I103dd3afb44c16af7aae6182ca761d8e7f0af9d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix "Assigning instead of Comparing" in tst_QResourceManagerAurélien Brooke2022-11-301-1/+1
| | | | | | | | | | | Fix "Assigning instead of Comparing" in tst_QResourceManager::heavyDutyMultiThreadedAccess() Task-number: QTBUG-107693 Change-Id: I018bf83dc7a3cc9d6faa654a73b2d460c3e4498a Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit abbe8ffb212e9c77fb2e499a6618699c509e126d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-11-291-3/+3
| | | | | Change-Id: I70e1e87524043fd9af2e493e8a77d8498b16ac3f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* RHI: Fix memory leak in RenderCommandTasuku Suzuki2022-11-292-0/+7
| | | | | | | | | | allocated in Renderer::setBindingAndShaderResourcesForCommand Task-number: QTBUG-106972 Change-Id: I4d0a64f1fbb0e9037b1e4c930f91e1b55412f180 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit ca499bf7f07f7e39371f6909f3c85084be648084) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-11-231-2/+2
| | | | | Change-Id: Ic3ec51ddc020bf20de489cb5341196362f837eff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-11-221-4/+4
| | | | | Change-Id: I1d9c60b8aed55ac4ab52b20d125b1bfa75d683ca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Port from qAsConst() to std::as_const()Marc Mutz2022-11-1975-186/+186
| | | | | | | | | | | | | | | | We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. This is a 6.4 re-run of the script we ran in dev, in order to avoid conflicts between the branches when cherry-picking. Change-Id: I5eca3df3179dfb2b2682c75a479ba9a4259cc703 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Port from container::count() and length() to size() - V5Marc Mutz2022-11-19112-709/+709
| | | | | | | | | | This is a the same semantic patch (qt-port-to-std-compatible-api V5 with config Scope: 'Container') as in dev. I've re-ran it in 6.4 to avoid cherry-pick conflicts. Change-Id: I9621dee5ed328b47e78919a34c307105e4311903 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-11-181-4/+4
| | | | | Change-Id: I36dececf8252229f3182d69d00f869e7349f9c4a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Unpin previously used image units during render command parameter setupOle Wegen2022-11-171-0/+4
| | | | | | | | | | | Image units are not unpinned after executing a render/compute command and before executing the next one. This can lead to failure during binding of textures to image units if the number of required image units of subsequent commands exceeds the overall number of image units. Therefore, the image units are now unpinned during parameter setup of each command. Change-Id: I9ae7be0bf8c2efe33aca836ef9e81db7c8f5b654 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 51aa6ab005e86c6a1c5d4c91671bd8c68dde0dea) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-11-141-4/+4
| | | | | Change-Id: I0e72ce276548fbaa5ea0aaea2e552aad47f1898c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-11-121-4/+4
| | | | | Change-Id: Id777b6507dc99c46930d6efa50cd4a5359b1ebd0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.4.2Jani Heikkinen2022-11-122-2/+2
| | | | | Change-Id: Ic58febcff74d27403cd9f06c7faf678d3c39b23b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-11-071-4/+4
| | | | | Change-Id: Ibf70bc039900ee0a8bd61ac73a075a8bd5157e94 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Quick3DNodeInstantiator: fix crash when using asyncPaul Lemire2022-11-043-8/+90
| | | | | | | | | | | | | | | | | Something in the asynchronous creation of elements in QtQuick has been changed leading to elements of the instantiator being created out of order. QQmlInstantiator and friends had been updated at the time when the QtQuick changes were made but Quick3DNodeInstantiator was left out. This patch incorporate changes that have been made into QQmlInstantiator to correct out of order node creation. Task-number: QTBUG-56368 Change-Id: I2aa7499e6dc08be329cd42ded7377acd4088e0c7 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit de7fc9d250db39185151b0a100519800f42556fd) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* ShaderParameterPack: check we only store a single UBO/SSBO per BlockBindingPaul Lemire2022-11-022-2/+80
| | | | | | | | | | | | | | Since we cache ShaderParameterPacks over multiple frames, we need to ensure that we check that when setting a UBO/SSBO we don't already have an entry matching the block index. If that's the case we should simply replace the entry rather than append a new entry. Failing to do so results in appending a growing number of UBO entries for the same block. Change-Id: Ie7535a80b9426ce2fd5ab6ebe16ea71bd7447750 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit f672753556cf28d44f864457dc6338a55e2e0ed4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* OpenGL graphics helpers fixesPaul Lemire2022-11-026-9/+18
| | | | | | | | | | | | | - Adjust warning message to match GL version they are used against - Correctly call glDrawElementsInstancedBaseVertexBaseInstance on GL 4 - Overload glDrawArraysInstancedBaseInstance to call glDrawArraysInstanced on ES 3 Change-Id: I54e054cc636327e424e4732362dfa2d79562d958 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 7678db1b8ac5a75950b70daf60baa7b42fd826d1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* GLTFGeometryLoader: prevent early return on option bufferview target propertyPaul Lemire2022-11-021-9/+0
| | | | | | | | | | | | | | | The glTF specs mention that the target property on a buffer view is not required: https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#reference-bufferview Therefore, since the parser would return early if no target was specified, preventing any mesh from being loaded. This patch removes the target checking which serves no purpose. Change-Id: I7b1781060b79d1d102c1366dc1884a9f283a7f9f Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit cffc59ff37fbce8fe987e2b4ee64b3d03b3928e9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-11-011-4/+4
| | | | | Change-Id: Ia981f2e2d7d1befef1358987f0bd0c85d0b107ca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix unused parameter warnings on WindowsJohannes Kauffmann2022-10-282-0/+8
| | | | | | | Change-Id: Ib1713bbbabc75a30a3130e9db715479a35d0f3fc Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit d73c2b212d867ac327044939ada277ace0a86e78) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-10-271-4/+4
| | | | | Change-Id: I977b4dfb144f1355bc20869929ccff5ddd7cda09 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* RHI: Set default render target for RenderCaptureYAMAMOTO Atsushi2022-10-271-1/+1
| | | | | | | | | | | Current QRenderCapture captures the entire window, but it should capture the 3D scene. Task-number: QTBUG-106865 Change-Id: Icc92ad31f5ae099858477d84735957d1a0113538 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 5fbc3826c289596099b8e2e828252e9d21d88d4b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-10-261-4/+4
| | | | | Change-Id: Ia28cfb30c7a582450b4d15cb7df2d550b28037d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-10-211-4/+4
| | | | | Change-Id: I16f8b9b703a2c6f2d63e0c6df552ce4f4996e4fa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix audio-visualizer exampleTomi Korpipaa2022-10-203-22/+23
| | | | | | | | | Fixes: QTCREATORBUG-27852 Change-Id: Icc10aa51f54a7ff19dcff2349048b436f273d6bf Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> (cherry picked from commit be9ccff07db89d2b6470b5654b0244ee8699c150) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add license text file for CC-BY-4.0Kai Köhne2022-10-191-0/+156
| | | | | | | | | | | | | | CC-BY-4.0 is referenced in the qt_attribution.json files examples/qt3d/exampleresources/assets/obj/qt_attribution.json examples/qt3d/planets-qml/images/solarsystemscope/qt_attribution.json but no license text was provided so far. Change-Id: I9c822f05402dad22c02567001d051b08a3ac7de3 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit e06bccdc935ddd04259fe81cbc17f471837ae4e2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-10-191-4/+4
| | | | | Change-Id: I3f18fc5440262a2d51504d5ad0047862e408cb13 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-10-181-4/+4
| | | | | Change-Id: Iab319649956ee57a5c451adebf6b4fbfa2fbac51 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-10-171-4/+4
| | | | | Change-Id: Id0b3c540679e81fc5382d6f8d75df0321fb1af1c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-10-141-4/+4
| | | | | Change-Id: I669b09a16633cd8184ce3b8f032da385667b5a8a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-10-131-4/+4
| | | | | Change-Id: Ibecf81a44cfb77ce3fa5f5a1e2abd3570762b8cd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-10-071-4/+4
| | | | | Change-Id: Ib26df582c3081627837d4d3567089fee8643d710 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-10-061-4/+4
| | | | | Change-Id: Iaef7d18fd5993fdc71206681ed5775a51da32cfe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-10-031-4/+4
| | | | | Change-Id: I12b0a10a7e8c5889c5136a1ebdee8e4e825af07c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-09-301-4/+4
| | | | | Change-Id: I7d8fd8109dbcb911158ae8f0236da4ddfde9e831 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-09-291-4/+4
| | | | | Change-Id: I0e8e1d411177785a1f537dc09ac883609ce9d8fa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-09-281-4/+4
| | | | | Change-Id: I0b762f79b0ff04f0e67f579aa3afabc80c0075a7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-09-261-4/+4
| | | | | Change-Id: Ia3dd0ce03c17f661460e42074b4e8a5709ae3def Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-09-201-4/+4
| | | | | Change-Id: I1ada7009d6a1c3533147ae119790b632b5332202 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-09-191-4/+4
| | | | | Change-Id: I7915d0cf7c298e115ebd580bf8a1b0db65f7c3d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-09-161-4/+4
| | | | | Change-Id: I19cdd883ced730d7df4f69b58393d9d5beb7896b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.4.1Jani Heikkinen2022-09-162-2/+2
| | | | | Change-Id: Ib7a2644306f975140d2cd7c19e1432ae32cde081 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-09-151-4/+4
| | | | | Change-Id: I225dddb16a8188be1943095a1c7ae538dd60d57f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-09-141-4/+4
| | | | | Change-Id: I28f86c3409809c1a2ecf1b5d172515db7b4ae808 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-09-131-4/+4
| | | | | Change-Id: Ic1a2cbbb49fee9b730ee9285a3082bf041afc93c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
View Lorry Controller Status