summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2.4' in qt/qt3dv6.2.46.2.4Qt Submodule Update Bot2022-03-041-3/+3
| | | | | Change-Id: Ibfaff5bff3577fd17e6d95771ce47a8a7ee16b22 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.4' in qt/qt3dQt Submodule Update Bot2022-02-211-3/+3
| | | | | Change-Id: I76afa6b2ad5e2a877f53f668b635226e2252e4b6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2022-02-171-3/+3
| | | | | Change-Id: I51ca9de83cf6497e49d76912485535b7433f9794 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2022-02-101-3/+3
| | | | | Change-Id: I7a47cbc45fa1a895e853725bb95feb8d4fb5d51d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Switch examples to build as isolated sub-builds part 2Alexandru Croitor2022-02-051-1/+1
| | | | | | | | | | | | | | | | qt_examples_build_begin needs the EXTERNAL_BUILD flag to know that it's safe to build examples as ExternalProjects. It still won't do it in CI until we enable building examples as ExternalProjects for prefix builds. This is preparation for that. Task-number: QTBUG-90820 Change-Id: I7bd1fdddfba2b87280ebe8bc0762746ade8da468 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 967130d6613ff2c11b35e7f8c5510cae5a03ad5e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2022-02-011-3/+3
| | | | | Change-Id: Ie5b5f4a3a7bbaa56e514bb89a1cd446e44bb3820 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.2.4Jani Heikkinen2022-02-012-2/+2
| | | | | Change-Id: Iafa0095c1a95b3f3b15742f82cb16ac93e708ca5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Use big resources in some examplesJoerg Bornemann2022-01-273-108/+6
| | | | | | | | | | | | | Update CMake project files for examples that use exampleresources/textures.qrc to use big resources. This avoids too much memory load on the compiler process. Fixes: QTBUG-100201 Change-Id: Iba933361f66ccb459f6fd1b36774748117b9655c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 30199e8ab7e05f5370fc28261c9dc72352fb0c1a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2022-01-201-3/+3
| | | | | Change-Id: Idda766b80829883ee8a6c2edebb586a5a46c166c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix compilationMike Krus2022-01-191-1/+1
| | | | | | | | Task-number: QTBUG-99945 Change-Id: I6bafcb26e976e80a0987e2f1d6950cd7cf811794 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit a09a74146416a9e17a9ca5dd705688b33151da83) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2022-01-191-3/+3
| | | | | Change-Id: I4465308728e18b88083be4367c287138aba5a2bd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2022-01-041-3/+3
| | | | | Change-Id: I5fe31cf0ce3a310c6d21efdbdd4bff5ce5da83a1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2022-01-031-3/+3
| | | | | Change-Id: Ic8ed77be36eff3c1097b2be50be073580fc16999 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-12-211-3/+3
| | | | | Change-Id: I98f43b9b1b36b06dc44fa4183f2386daa44b6f53 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.2.3Jani Heikkinen2021-12-212-2/+2
| | | | | Change-Id: Ib45df47cd5a56906e24c6d11dcc54c3ad135364c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Move Qt::Concurrent to the PUBLIC link sectionAlexey Edelev2021-12-201-1/+1
| | | | | | | | | | | | | | | | | This is the workaround of QTBUG-86533. The Qt6::Concurrent target needs to be added to the IMPORTED_LINK_DEPENDENT_LIBRARIES_RELWITHDEBINFO property of the exported Qt::3DCore target. This doesn't happen bacause Qt6::Concurrent is INTERFACE_LIBK_LIBRARY propagted by versionless Qt::Concurrent target. Qt::3DCore links Qt::Concurrent only and due to the issue in CMake, CMake skips adding Qt6::Concurrent to the IMPORTED_LINK_DEPENDENT_LIBRARIES_RELWITHDEBINFO list. The workaround propagates the Qt::Concurrent to the Qt::3DCore consumers explixitly as the interface link library. Pick-to: 6.3 dev Change-Id: I5ecbc1c9c695bd2ce6022f123ff1496cce3ff32a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Switch examples to build as isolated sub-buildsAlexandru Croitor2021-12-151-24/+24
| | | | | | | | Task-number: QTBUG-90820 Change-Id: I975f67a1899363687092b25d936c874163c661ea Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 7611c48f0c7fbebb33ffa3741de2d6eeb0663217) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-12-131-3/+3
| | | | | Change-Id: Ib60c22fcb58610108bf6ff31300957cbe1f0dd0c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-12-111-3/+3
| | | | | Change-Id: I6dc28b48920de19e557885ee08458a99d42de3f0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-12-111-3/+3
| | | | | Change-Id: Ib3c937a63ecc6554af0b57f671f6a565214021c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Don't attempt to build pugixml.cppJoerg Bornemann2021-12-101-2/+1
| | | | | | | | | | | | | | | | pugixml is configured as header-only library by default. We must not compile pugixml.cpp. The qmake project file listed pugixml.cpp as source file, but it was not compiled, because qmake automatically detected that pugixml.cpp is included by pugixml.hpp. CMake does not have this automatism. Fixes: QTBUG-97254 Change-Id: Ibaf434f326d42e2fdea79f359cc625338644ce4d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 89f3dcb444b689090234652741127d6f6c47fdd9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-12-101-3/+3
| | | | | Change-Id: Ia8e57ed8d79f09f1d2d81537859c591cdf237a03 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Clean up license filesKai Köhne2021-12-084-1155/+451
| | | | | | | | | | Only include license files that are actually referenced in the source text. Change-Id: I2d04ef581a0b34d9cace3d1a1a790233fd921e5a Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit efebab426f63e2707be0fc874ae73700834cec8c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: trim down the manifest file from unneeded tagsAssam Boudjelthia2021-12-031-44/+38
| | | | | | | | | | | Follow-up to 468e4a8242da3e795fe0b218f97cfd97a1d7e032. Fixes: QTBUG-95439 Change-Id: I1584ca4b29b25e669c8844be1a6941025c93288f Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit cdc32c1e4ad205d20117cb84bd81efb5539365ca) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* OpenGL renderer: restore surface on context when shutting downPaul Lemire2021-11-301-27/+39
| | | | | | | | | | | | | | | | | | | | | | When using a QQuickWidget and Qt3D, on shutdown and assert occurs. This is the result of the QQuickWidget expecting the surface on the context to be its own internal surface after the QQuickRenderControl has been invalidated. This conflict with what Qt3D does on shutdown as it makes the context current on its own internal offscreen surface on shutdown. Therefore, to fix this issue, we record the surface in use before Qt3D shuts down and we make the context current on it after Qt3D has shutdown. Arguably, the fix should really go in QQuickWidgetPrivate::invalidateRenderControl where the QQuickWidget should check that the current surface is indeed the one it expects and set it accordingly. Change-Id: I534dc330a30a2ad5d17a6416715d03206ef4b1c9 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 559d77cacf7a3f6a29d3debec6d61a2ef8a59dc9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-11-301-3/+3
| | | | | Change-Id: I64c6655d7554ecabd56db582ae0f4da26bd3b574 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-11-291-3/+3
| | | | | Change-Id: Id2fc7110723676f86581f9e92538fd38ddbbec33 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-11-281-3/+3
| | | | | Change-Id: Ia61348aa3ed6fe6d490e422766f4f7dad0f6cb5a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "AnimationClip: fix the way we compute the duration"Paul Lemire2021-11-261-7/+4
| | | | | | | | | | | | | Turns out we want the global clip duration and not the relative clip duration. Therefore global clip duration is always computed from 0. If the first keyframe is offset, then this means animation does nothing until t=offset. This reverts commit 7b23cb1ca5b32fcf24f889e79cec756786f86233. Change-Id: Ic045a3cdea5eac4b8e35b75737e3ae6f00b9fa20 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 98599ddee4761cf1970a97737293f5f627f3f61a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix configuration error if libassimp-dev is installedJoerg Bornemann2021-11-261-0/+18
| | | | | | | | | | | | | | | | | | | | | | On Debian-based Linux distributions, we got errors like Imported target "WrapQt3DAssimp::WrapQt3DAssimp" includes non-existent path "/usr/lib/include" if the libassimp-dev package was installed. This is due to a packaging problem as described in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=973361 Work around this issue by fixing the known wrong include path. Task-number: QTBUG-98420 Change-Id: If0052d012132ffddc056e20f1f65bf13723b0219 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 6c573dc4a5a08ab7b75ed1fbd93bd0f21c61a08a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* RHI: Fix content not updated when using OnDemand and switching texturesPaul Lemire2021-11-241-0/+5
| | | | | | | | | | | | | | When changing a Parameter whose value is a texture, it takes Qt3D potentially two frames to process the scene fully before it is able to draw the updated content. This patch makes it so that if we know we have the flags ParametersDirty for frame N, we request to reprocess the scene once more on frame N+1. Change-Id: I9df868ce2aac857bad1a1cb1074038b9c5bcd907 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit 9bdabc8c1412ae58080f700f42f2393c6357788a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* OpenGL: Fix content not updated when using OnDemand and switching texturesPaul Lemire2021-11-241-0/+5
| | | | | | | | | | | | | | When changing a Parameter whose value is a texture, it takes Qt3D potentially two frames to process the scene fully before it is able to draw the updated content. This patch makes it so that if we know we have the flags ParametersDirty for frame N, we request to reprocess the scene once more on frame N+1. Change-Id: Ia635e324434f92f8423a68b72d99350d96830de6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit 672da697b147f039effbfd352b20f3f1891f31c6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* AnimationClip: fix the way we compute the durationPaul Lemire2021-11-241-4/+7
| | | | | | | | | | We wrongly assumed the start time of a clip was always 0. In practice this might not be the case. Therefore, we now compute duration as tEnd - tStart. Change-Id: I13ca860f3366c2aba5e978cb0c955e7bb2e7bc39 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit 7b23cb1ca5b32fcf24f889e79cec756786f86233) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Q*FActory: remove unused path argumentsThiago Macieira2021-11-2310-184/+23
| | | | | | | | | | | Cargo-culted from somewhere but not used in any of these classes. This just made the code bigger for no reason. Task-number: QTBUG-97950 Change-Id: Ice04365c72984d07a64dfffd16b48632888ed664 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 0158a3ddfb1ad367c0b969ffa72caa18cee322fd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix MSVC warning in opengl renderview.cppKai Köhne2021-11-221-1/+1
| | | | | | | | | | Fix warnings like warning C4267: 'argument': conversion from 'size_t' to 'const int', possible loss of data Change-Id: Ibfe45493a6627af6cedd0afa536d892ebd8be0e8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit a262506bdb2d7fbc7e24ce5049d1593f2d6940fb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QGeometryFactory: don't make op== virtualMarc Mutz2021-11-174-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | That's too clever, and it backfires with compilation errors in C++20 mode: qt3d/tests/auto/render/meshfunctors/tst_meshfunctors.cpp:129:29: error: ambiguous overload for ‘operator==’ (operand types are ‘MeshFunctorA’ and ‘MeshFunctorB’) 129 | QVERIFY(!(*functorA == *functorB)); | ~~~~~~~~~ ^~ ~~~~~~~~~ | | | | MeshFunctorA MeshFunctorB qt3d/tests/auto/render/meshfunctors/tst_meshfunctors.cpp:72:10: note: candidate: ‘virtual bool MeshFunctorB::operator==(const Qt3DCore::QGeometryFactory&) const’ (reversed) 72 | bool operator ==(const Qt3DCore::QGeometryFactory &other) const override | ^~~~~~~~ qt3d/tests/auto/render/meshfunctors/tst_meshfunctors.cpp:50:10: note: candidate: ‘virtual bool MeshFunctorA::operator==(const Qt3DCore::QGeometryFactory&) const’ 50 | bool operator ==(const Qt3DCore::QGeometryFactory &other) const override | ^~~~~~~~ Fix by providing a symmetric operator== for QGeometryFactory that delegates to a virtual equals() method. Change-Id: I23d29ad1b16075629132f2b4757c5810d5615a36 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit ec291f9974ba6d25148955a0b9e55b30c589a9be) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix licensing headersMike Krus2021-11-173-12/+45
| | | | | | | | | | Historical copy/paste error, now correct. Task-number: QTBUG-98097 Change-Id: I2152fa8d974f26e2aa9e7e3d560a1e8270e7aaf1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit 9f3f8da7454a33d5cae7d581c82672e999609d66) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-11-091-3/+3
| | | | | Change-Id: Iee4a0ddce4357b333ff7f38a1d763aafe27c9c1c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-11-051-3/+3
| | | | | Change-Id: If3d729df211f19af96a7ccda0113fc6d7ade20d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-11-041-3/+3
| | | | | Change-Id: I82e2ba25fd54413af9d7bf7bcc2ca84caabd4d8e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* ComputeCommand: call markDirty(ComputeDirty) when enabled changesPaul Lemire2021-11-032-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | When using Manual run mode on a QComputeCommand, we rely on the enabled property changing to enable/disable the backend ComputeCommand for a given set of frames. Since we weren't setting any dirty flag when the enabled property changed, Qt 3D was not rebuilding the list of active compute commands but rather using the one stored in its cache. This resulted in the ComputeCommand, now disabled, to still be called for execution until something else triggered a command rebuild. The renderer calls ComputeDirty after it has executed a compute call. This explains why eventually we only had 2 calls (and not a perpetual loop) when calling trigger(1). One was the valid call, followed by the invalid one (and then the command list got rebuilt because of the ComputeDirty flag set by the renderer). Task-number: QTBUG-86493 Change-Id: I7b31606a03609dc13294256b1dac89ee86730ba1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit 3d4ac623d444bbbaddc7f63163b204f6c6a55cab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix Compute-Manual manual testPaul Lemire2021-11-031-1/+0
| | | | | | | Change-Id: I78c11accf69eb4ce8774885bce5303ef3c934926 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit a8562dd604074c98c473f1cf0d496aebd2cc0d37) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* ObjectPicker: markDirty(AllDirty) when we change the enabled propertyPaul Lemire2021-11-031-2/+7
| | | | | | | | | | Otherwise we would simply change it internally but this wouldn't lead to any actual changes in how we handle pick events. Change-Id: I71aedc74db538978a939620d053af3167fd67dc4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit d32ff6b43b92474de495c88783a67b0b30211a7c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump version to 6.2.2Jani Heikkinen2021-11-032-2/+2
| | | | | Change-Id: I93d42d963144895ac356aeecf3db4f9e04b23445 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-11-031-3/+3
| | | | | Change-Id: I8e22f57aac7f7066cdff92d8d9e8f201952e6b6a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-11-011-3/+3
| | | | | Change-Id: I6cdbac65336d805b1a91e741b6d3c8539dfe3a16 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-10-291-3/+3
| | | | | Change-Id: I312cbef55cb35b6be1522e80c7c8f8e04e5599f0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-10-281-3/+3
| | | | | Change-Id: I26a51eaf6ca06d0feddcf6f647ef3dc51c3c06f4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-10-271-3/+3
| | | | | Change-Id: Ib9066b88526955785ab43b5ffc6be4b3dbafc24c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-10-261-3/+3
| | | | | Change-Id: If9eec402372210771681521375c3914a3180612a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 15:12:35 +0000