summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.7' in qt/qt3d6.7Qt Submodule Update Bot37 hours1-4/+4
| | | | | Change-Id: Icbc546d9ef13ea6736422583d4a0041f96d00780 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot3 days1-4/+4
| | | | | Change-Id: I5e10fac0b13a765f6f438959e7cbdb84c30fc3c6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update Assimp to v5.4.0Mike Krus5 days4-42/+95
| | | | | | | | | | Fixes: QTBUG-125025 Pick-to: 6.5 Change-Id: Ib1f9136aedb2035b780174b3d8f2973d31f74c89 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 5e413dcc3261e5ef5f5c2b80acdad587c3e14235) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 1a0216c01dc9152b932a1d96ae0cdf7db3aa632e)
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot6 days1-4/+4
| | | | | Change-Id: I2484d7c4b2e7b91be7e31a6971761b4a6c729cfc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot7 days1-4/+4
| | | | | Change-Id: I515a1785ff8dcf6de47f724cdb2bed41048b99cd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot8 days1-4/+4
| | | | | Change-Id: I7e13b140be7bb16a39a391d756c6bde60ce13d0e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot9 days1-1/+1
| | | | | Change-Id: Idb455aea334d26d0af0cb69c3b7317115df33bb2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.7.2Jani Heikkinen9 days1-1/+1
| | | | | Change-Id: I2dbe9819c48d4cbb94abe65763d1fc1d8f05f1de Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot9 days1-4/+4
| | | | | Change-Id: I47dc8b408bd4ad9df5c12bae34e19c33a22d01f7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot13 days1-4/+4
| | | | | Change-Id: Ida415012d3c5eb59057e969993a2e5209b16dccf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Correct license for test filesLucie Gérard2024-04-23699-699/+699
| | | | | | | | | | | | | According to QUIP-18 [1], all test files should be LicenseRef-Qt-Commercial OR GPL-3.0-only [1]: https://contribute.qt-project.org/quips/18 Task-number: QTBUG-121787 Change-Id: I966d4033a73aacabb39f582270f2f1c18e2bcecd Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 28bba0ad9371bea3df1df9e278a514bb896c8ac5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Change license for tools filesLucie Gérard2024-04-193-3/+3
| | | | | | | | | | | | | According to QUIP-18 [1], all tools files should be LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 [1]: https://contribute.qt-project.org/quips/18 Task-number: QTBUG-121787 Change-Id: I1f7d2bfd26fd45763a59a22c14686b9ded8d3491 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 0a301ca2f21fb45b29ddeb8cc3f6959e38f987ae) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-04-171-4/+4
| | | | | Change-Id: I5c539e36623d646b2710f40a07798215f3cc9038 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Change license for snippets and examples filesLucie Gérard2024-04-1714-14/+14
| | | | | | | | | | | | | According to QUIP-18 [1], all examples and snippets files should be LicenseRef-Qt-Commercial OR BSD-3-Clause [1]: https://contribute.qt-project.org/quips/18 Task-number: QTBUG-121787 Change-Id: I34b4d6d4a5a6715fb270a916ac7c19c3a09b27d9 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 5b30fe6b8c3d1c9bf01e00fcdc16a4ed74d661be) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-04-161-4/+4
| | | | | Change-Id: I30e2e504d3aaf077c4e4152daa6ca6b0889d8bf5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-04-101-4/+4
| | | | | Change-Id: Ic56106ffbc94abf1455b7ec6fd5fe47f4146933f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QMouseHandler: fix QObject::connect() callAhmad Samir2024-04-052-10/+13
| | | | | | | | | | | | | | | | | | This connection was created in QMouseHandlerPrivate's constructor, however at that point the `q_ptr` hadn't been initialized yet, so the connection's 3rd parameter was null, which produced a runtime warning. Move the initialization, and other relevant code, of the QTimer member to init(). Drive-by change: use chrono literals; add missing include. Amends 7671478aad2d2a48148852e9ce5a5b598a59f23d. Change-Id: I305e740617e83cf8120ffc25c67004a7dbcc1df8 Reviewed-by: David Faure <david.faure@kdab.com> (cherry picked from commit 76928231ffa4d6394ace71aa2573293fffac954c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-04-041-4/+4
| | | | | Change-Id: Idfa925a1c0fc22b9c2b0a6e32159ce9601720d45 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-04-031-4/+4
| | | | | Change-Id: I0181efa694e6e7c0b22ebf75fc8ade4c9cd4389e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-03-281-4/+4
| | | | | Change-Id: I681817d0d1ed89d93acf372a72eabe80c26fb13e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-03-271-4/+4
| | | | | Change-Id: Iab586d758b77a17b6464da790ea00d7dec1d6a7b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-03-221-4/+4
| | | | | Change-Id: I55aecc844e63ecd87441cd171ae6d0db3509c7aa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-03-201-4/+4
| | | | | Change-Id: Ia4952ea21cf0adacb2af344d5bf3d23740ed0bec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.7.1Jani Heikkinen2024-03-201-1/+1
| | | | | Change-Id: I0de39e72b6c3476d8251c70d0bf00649c5163e60 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* fix stereo renderingAlexander Busse2024-03-192-17/+9
| | | | | | | | | Change-Id: I1f55f4ce10107b5d4b3f92e1cb022a0c6595186b Pick-to: 6.7.0 Task-number: QTBUG-123483 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 34a079506ee9cf7fc692261aa2949a2e662ce45f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-03-051-4/+4
| | | | | Change-Id: I282d2da1c907d95d2f22686e35a6ab436c895907 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-03-031-4/+4
| | | | | Change-Id: I31efd948c21f636c15698a99c7f161096dd8c356 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-03-011-4/+4
| | | | | Change-Id: I50de6fe7193daece878d425f4845d47e128ad7a6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-03-011-4/+4
| | | | | Change-Id: I058123df9a7380d68d5462e73f9d1e7a629931df Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* RHI: ensure there is always a valid m_currentUpdatesAurélien Brooke2024-02-281-14/+6
| | | | | | | | | | downloadRHIBuffers() needs a valid QRhiResourceUpdateBatch Fixes: QTBUG-121702 Change-Id: I22e97c028aa6b85b505b64b8f65f9a18e31ea2c9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit c6e499dae2b943de4acf831be596eebc444d2315) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix crash in QPaintedTextureImage when never calling repaint()Aurélien Brooke2024-02-281-0/+3
| | | | | | | | | | | | | | | When creating a QPaintedTextureImage without calling repaint() nor resizing, Qt 3D crashes because there is not generator created. Even though it is not a normal use case, avoid crashing, by creating an empty generator in the constructor. Fixes: QTBUG-122613 Pick-to: 6.6 Change-Id: Iac5abd7d728330c5fa28e3de49a1e7ff261ace3f Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit b1767913a2f8b1e366ff426f74380fbc06f92b7a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* ShaderData: Atomically generate property valuesAlexander Hulander2024-02-283-12/+11
| | | | | | | | | | | | | | | | Ensure same lock is used when generating property values for ShaderData. Not doing so could cause a race condition if two different threads checked if ShaderData contained property value for a given block at the same time. Also removes unused method to avoid similary issues in the future. Fixes: QTBUG-111427 Pick-to: 6.6 Change-Id: Iadf88aeb7a440bcfd46f2a8e164403fa7d6e1713 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit c6fafcb66814c1de1fd67c1e049d94c94ce0d2f0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-02-271-4/+4
| | | | | Change-Id: I8c431498674a18816491c01a5a1ff39ca6364318 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-02-231-4/+4
| | | | | Change-Id: I787bc5fc592ce7e90257955325f113eb0b603bc3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-02-211-4/+4
| | | | | Change-Id: Id89188df3b0585390130deffb54a0bd4afe37ebb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Move examples to '3D' categoryTopi Reinio2024-02-217-7/+7
| | | | | | | | | Task-number: QTBUG-122377 Change-Id: I674641da56e2a5c3578a81ff3236f7389e5ddd24 Reviewed-by: Jaishree Vyas <jaishree.vyas@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 5277afc2b7c6e4330293ee777fc8cb2e8ed52a5e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-02-191-4/+4
| | | | | Change-Id: I41096fdc1f96c38a92faa2ad351f4d166d848e8f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-02-161-4/+4
| | | | | Change-Id: I0ecc5613bb68fc3539cf01ec637e5810096f6646 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dv6.7.0-beta3Qt Submodule Update Bot2024-02-101-4/+4
| | | | | Change-Id: If2c5663938e70db3ef1b9ccf44b7c51c988f6c7c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* build system: fix unity buildsTim Blechmann2024-02-07117-173/+260
| | | | | | | | | | | | | | | we need to avoid polluting the global (or qt) namespace by moving the `using namespace Qt3DXXX` statements into the namespace where it's actually required. furthermore: * replace `QT_USE_NAMESPACE` with `QT_BEGIN_NAMESPACE`/`END` pair * exclude some translation units with name clashes inside anonymous namespaces Change-Id: I5301b55c6a0c7079602c759f5bde152354149880 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 06bb491354489b06998306ea9de87da92314b397) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-02-071-4/+4
| | | | | Change-Id: Ie3a85bcd22330bbcd841c8d35f5e261abc049f4b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-02-051-4/+4
| | | | | Change-Id: I7d8fb27127502f9b0ed33c4607d064aac095e195 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-02-011-4/+4
| | | | | Change-Id: I7e8d2d4f7cebd5550334bab394bcafb0b980334d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* animation: silence clang warningTim Blechmann2024-02-011-2/+0
| | | | | | | | | | silence's clang's: variable 'channelIndex' set but not used [-Wunused-but-set-variable] Change-Id: Ie551ebbd7c3e49146fe0db4cc01c39be45437752 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 2477a0b1c9e6fd92d74e0f237caa1b2c9a1cbee0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* animation: silence clang warningTim Blechmann2024-02-011-1/+1
| | | | | | | | | fixes clang's: -Warray-parameter warning Change-Id: I8c1af840b37a0e83252cf64539c384fb5240ba90 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit afc99d91af4d27011c777aac101593bf1e1be04c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* bigscene-instanced-qml: set correct instanceCount value on parameterPaul Lemire2024-01-311-1/+1
| | | | | | | | Pick-to: 6.6 6.5 Change-Id: I1c059645ce9dee26784a0d4a1df6a9cb1046a02f Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 582e38a1cca63334c01fb4fff65f0d6d36c8de6f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Address API review commentsMike Krus2024-01-311-30/+14
| | | | | | | | | | Added revision number to properties added in 6.7 and made sure all slots were tagged properly. Change-Id: I558824cb22fdf8d66c1f6859c5112ea912bdc21c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 58c4843826f814556b80ce75cf36f5901e550ae6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dv6.7.0-beta2Qt Submodule Update Bot2024-01-241-1/+1
| | | | | Change-Id: I6f2d4c3ac5952d1742eb473f50d37588c34f699e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-01-231-4/+4
| | | | | Change-Id: Iefd97b59568718563732cd29afe23b0f24f1a9fc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-01-201-4/+4
| | | | | Change-Id: I235263b27e0e42cd06ae06b6c0737ad2c8e46293 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-08 23:28:19 +0000