summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qt3dHEADdevQt Submodule Update Bot5 days1-4/+4
| | | | | Change-Id: I5da8ad326cd9b5195d740bd82c190db48d4c50d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update Assimp to v5.4.0Mike Krus6 days4-42/+95
| | | | | | | | | Fixes: QTBUG-125025 Pick-to: 6.7 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>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot6 days1-4/+4
| | | | | Change-Id: I3f6ff18ea57b50f8f1d6e8b18241318b7dd49da4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix developer builds not finding headers for qml input pluginMike Krus6 days1-0/+1
| | | | | | Task-number: QTBUG-124907 Change-Id: I78b2c1af71091896da715b8235684649a95113f2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot13 days1-4/+4
| | | | | Change-Id: Ieeeb6fbcdaf16430543278fdc461bc2d1ac85a1b 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 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I966d4033a73aacabb39f582270f2f1c18e2bcecd Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* 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 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I1f7d2bfd26fd45763a59a22c14686b9ded8d3491 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-04-191-4/+4
| | | | | Change-Id: I7fcad4a38ad4e2979ac2446264e1ff52008c86d5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-04-171-4/+4
| | | | | Change-Id: I8c9b5a07fca8fc8d1e819df1873639552d265e69 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 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I34b4d6d4a5a6715fb270a916ac7c19c3a09b27d9 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-04-051-4/+4
| | | | | Change-Id: Ia70c9852eab2049f7287043b47bd3aa08b096dc7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QMouseHandler: fix QObject::connect() callAhmad Samir2024-04-042-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. Pick-to: 6.7 Change-Id: I305e740617e83cf8120ffc25c67004a7dbcc1df8 Reviewed-by: David Faure <david.faure@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-03-261-4/+4
| | | | | Change-Id: I96d6930d5999f2a60b22f35c2e9a7c295a295d39 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 6.7.0 Task-number: QTBUG-123483 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-03-181-4/+4
| | | | | Change-Id: I4f180635a7b851ef6cc24e93e2487195c6934c91 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-03-151-4/+4
| | | | | Change-Id: I6946663c70c585db0d0cb85e1aa39f8a2dae392b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-03-101-4/+4
| | | | | Change-Id: I4ebdd68b67decd9b8ea26a7f0b659f3874eabe8b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QText2DEntity text alignmentAlexander Hulander2024-03-053-0/+40
| | | | | | | | Adds a new property to control the texts alignment. Allowing the text to be centered, right aligned, etc. Change-Id: Ifa21d6b5e4c9c97547063ecd38311397899f70e5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-03-021-4/+4
| | | | | Change-Id: I298c87866fb6db1547ad9e3371297fc0523d396c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Mark the whole repo with QT_NO_CONTEXTLESS_CONNECTAhmad Samir2024-02-2831-62/+13
| | | | | | | | | | By adding it to the default build flags via .cmake.conf. This amends commit f981367f365686e6c6bf99d0416d8fd6efb87f32. Task-number: QTBUG-116296 Change-Id: Ie1c95f4245694ea7bee17da2d32becc08132cb20 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* RHI: ensure there is always a valid m_currentUpdatesAurélien Brooke2024-02-281-14/+6
| | | | | | | | | downloadRHIBuffers() needs a valid QRhiResourceUpdateBatch Fixes: QTBUG-121702 Pick-to: 6.7 Change-Id: I22e97c028aa6b85b505b64b8f65f9a18e31ea2c9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* RHI: add support for Int and HalfFloat attributesAurélien Brooke2024-02-281-0/+22
| | | | | | | [ChangeLog][RHI] Add support for Int and HalfFloat attributes Change-Id: I1b0b913a629c92a2cb87e067ec0402b8fd59d4c2 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* 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 6.7 Change-Id: Iac5abd7d728330c5fa28e3de49a1e7ff261ace3f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* 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.7 6.6 Change-Id: Iadf88aeb7a440bcfd46f2a8e164403fa7d6e1713 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-02-271-4/+4
| | | | | Change-Id: Ib57577f54f94456e23a1c8082d10fc5d52e06869 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-02-241-4/+4
| | | | | Change-Id: Ic09de52269df8ac8b376e9bc05041aac2dbcd496 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Move examples to '3D' categoryTopi Reinio2024-02-217-7/+7
| | | | | | | | Pick-to: 6.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>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-02-191-4/+4
| | | | | Change-Id: I96f278853e4d9d54f0101d501da184ddd40803fd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fully qualify \property, \qmlproperty, \typedef, \enumLuca Di Sera2024-02-13116-508/+508
| | | | | | | | | | | Upcoming changes to QDoc require API entities to be fully qualified; previously, QDoc maintained a list of 'open namespaces' that were part of matching the documented entity with its declaration, but that concept does not work for parallelized parsing where the order of processing can be arbitrary. Change-Id: I1662fb4692b5c91a2d9e33eb17708544d9cd1ebb Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-02-111-4/+4
| | | | | Change-Id: I7243f81baeb89d7ec6c69bdf794383b18d846678 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-02-101-4/+4
| | | | | Change-Id: I3a0f7c9aaef43bb756aa1e0aad294054da9b2014 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 Pick-to: 6.7 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-02-071-4/+4
| | | | | Change-Id: Ie235fc31b7666049a3808da7b72fcb4816b21f52 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* animation: silence clang warningTim Blechmann2024-02-011-1/+1
| | | | | | | | fixes clang's: -Warray-parameter warning Change-Id: I8c1af840b37a0e83252cf64539c384fb5240ba90 Pick-to: 6.7 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* 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 Pick-to: 6.7 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* bigscene-instanced-qml: set correct instanceCount value on parameterPaul Lemire2024-01-311-1/+1
| | | | | | Pick-to: 6.6 6.5 6.7 Change-Id: I1c059645ce9dee26784a0d4a1df6a9cb1046a02f Reviewed-by: Mike Krus <mike.krus@kdab.com>
* 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. Pick-to: 6.7 Change-Id: I558824cb22fdf8d66c1f6859c5112ea912bdc21c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-01-271-2/+2
| | | | | Change-Id: I5b2ae8b14878d90b95facb84d5f7d1978b451716 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-01-251-2/+2
| | | | | Change-Id: Iaf15fe2b89699df96c20d332d7e19773e560e016 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add CMake autotestJoerg Bornemann2024-01-252-4/+5
| | | | | | | Task-number: QTBUG-84884 Change-Id: I21d27b35108c9d7aa1941e4fbc5850455b2099e2 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-01-231-4/+4
| | | | | Change-Id: Ib84889b7b344998781fd095621d3e7080bed562d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QAspectManager: avoid a temporary listAurélien Brooke2024-01-221-8/+5
| | | | | Change-Id: Ic3f9115a9d55038b3d8901b894d662164e8a79bc Reviewed-by: Mike Krus <mike.krus@kdab.com>
* RHI Shader: move the vectors around instead of copying themAurélien Brooke2024-01-223-54/+54
| | | | | Change-Id: I448db158d9278f70e9a90c7c87b2928e25942195 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-01-201-4/+4
| | | | | Change-Id: I35c8baa70c90e622b73fa1c6648b82d83de82565 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-01-191-4/+4
| | | | | Change-Id: Iee901c9e1ecf4923cfa748720e8de9b89a9000e4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2024-01-181-4/+4
| | | | | Change-Id: I1a37e256759046cfe374bf71d0034b4e1f14429c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QBackendNode: fix a small typoAurélien Brooke2024-01-181-1/+1
| | | | | Change-Id: I932571833ae612f635178189b3302f54bb15351c Reviewed-by: Mike Krus <mike.krus@kdab.com>
* RHI SubmissionContext: remove unused m_id and static_instancesAurélien Brooke2024-01-162-19/+0
| | | | | | | It is not used anywhere. Change-Id: Ia8cdc4e891cf50bb90767ae25fbe4e6c762e0f7c Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Enable uniform buffer for RHI compute shadersPhilip Schuchardt2024-01-161-2/+3
| | | | | | | | | | | | This enables uniform buffers for all rendering stages including the compute stage. [ChangeLog] Enable uniform buffer for RHI compute shaders Fixes: QTBUG-119659 Pick-to: 6.6 6.7 Change-Id: I7c83bc9bf33cef4b925b52b7f4d6cde79e7e62e3 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Scene3DMaterial shaders: provide versions for GLSL 120 and 130Paul Lemire2024-01-163-2/+2
| | | | | | Pick-to: 6.7 6.6 6.5 Change-Id: Ia9aee43e03ed9efb8538e6cd7b25fa06fa5cb97d Reviewed-by: Mike Krus <mike.krus@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 02:13:22 +0000