summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.5' in qt/qt3d6.5Qt Submodule Update Bot2023-10-131-4/+4
| | | | | Change-Id: I573b2c2a055378fff1e613ed96744335c2990a2e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-10-121-4/+4
| | | | | Change-Id: I6a5f9ac9de8c6a2b41a827495347bd9cc6d9d540 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix Race Condition in NodePostConstructorInit::processNodesPhilip Schuchardt2023-10-114-6/+12
| | | | | | | | | | | | | | | This fixes QTBUG-116770. This moves m_aspectEngine to the correct thread when it's created in Scene3DItem. And prevents processNodes from being called on the wrong thread. [ChangeLog] Fix Race Condition in NodePostConstructorInit::processNodes Fixes: QTBUG-116770 Change-Id: Iaf47ffd99ab6f920559b596a9baa8c253c135e40 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit e275b1c286d223463409c57a7300b7ddc56df061) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit a43c740d41d3a28c8cb74b4ae66baaa272a9dba9)
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-10-101-4/+4
| | | | | Change-Id: If0eed8d038c18572f3204718fec74e6e80c32a66 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-10-091-4/+4
| | | | | Change-Id: I034dbbc67cfbc9e21569642f298b1041c0a42e2c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-10-051-4/+4
| | | | | Change-Id: I5de5bf97ec99fa89080fa0650af3f92f06549c50 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* AspectCommandDebugger::trim: use memmove instead of memcpyPaul Lemire2023-10-041-3/+3
| | | | | | | | | | | | Since the ranges to copy overlap, memcpy isn't safe to use, memmove is. Task-number: QTBUG-117065 Change-Id: Ib4197f35c919b24ce229def0f5e154221d22357f Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Dimitrios Apostolou <jimis@qt.io> (cherry picked from commit 6a407b6e9bb24a87e7ff9434fea602029fd5ca67) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 4f1551ab67159d86309b1947e9ba7365192fb369)
* Don't change RHI's default surface format versionBogDan Vatra2023-10-041-3/+0
| | | | | | | | | | | | | Setting the defaut surface format version to 1, on Android, it creates GLESv1 contextes instead of GLESv2. Fixes: QTBUG-114037 Fixes: QTBUG-114036 Change-Id: I42fb1781d74069de00ecc10e227c558013773da0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit a9a7de6af54b9e68d8bd904e9346e213a76cf8ea) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit a035b2cb4cdd28086c19ac0864bd9fabf4439006)
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-10-041-4/+4
| | | | | Change-Id: Id6b2884cd6267e260d5a002986d7726eac415748 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-09-271-4/+4
| | | | | Change-Id: I5fc2f2d0bbfc5cea5955092dc4343173156d09d9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.5.4Jani Heikkinen2023-09-272-2/+2
| | | | | Change-Id: I506c07a44e7d4af5949623c29599a425a1e14a5d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-09-221-4/+4
| | | | | Change-Id: I041a6aa34c4c202dd63f61fe41fdb2f2cfd2b6bc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-09-211-4/+4
| | | | | Change-Id: I79f4a714675628d888a87285f8230c8322ad53ed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-09-191-4/+4
| | | | | Change-Id: I6af4323b4526791462644cc10d52c22df4194931 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-09-181-4/+4
| | | | | Change-Id: I5c066de97319f47853f662bc9e886f664ce1c7ca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-09-141-4/+4
| | | | | Change-Id: I00385d57bcd8ec9cdc4007da030baa3901b47159 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-09-131-4/+4
| | | | | Change-Id: I8b24b42813aa278a480d9a36bc0502b9dde066e4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-09-071-4/+4
| | | | | Change-Id: Iaf8321bcb462f87c8066a841bc97f438330192d8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-09-041-4/+4
| | | | | Change-Id: I31f76e60e9c04e0578d2493b758c16b271f2d7e0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-09-011-4/+4
| | | | | Change-Id: I0fb6b66246e773d7c0df474ed555ad772fe45bfa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-08-301-4/+4
| | | | | Change-Id: I3c9907e1c869352ceeac514656f53ad8f58f31ff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Add missing leading asterisk to qdoc commandAndreas Eliasson2023-08-3012-12/+12
| | | | | | | | | | | | | | Not adding a leading asterisk to a qdoc command that is part of a comment style with leading asterisks in the rest of that comment will cause qdoc to produce unexpected results. Adding a leading asterisk to all lines will make qdoc render things as expected. Task-number: QTBUG-116494 Change-Id: I7a507965f94a0c143f88c7c0b29c298c1dfcfc03 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Safiyyah Moosa <safiyyah.moosa@qt.io> (cherry picked from commit c8557d719b251dd660f410334fc57630a612227e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-08-291-4/+4
| | | | | Change-Id: I41e8c5d5bcefd1f201c2837ae21a0e9209d9049e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-08-281-4/+4
| | | | | Change-Id: Ib0a5eb1c02f9b701220caa57105ac35e40c6f4c5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Texture array support for RHI rendererPhilip Schuchardt2023-08-251-8/+14
| | | | | | | | | | | | | | This fixes QTBUG-116354 - Qt3D - Enable texture array. QTBUG-83343 has been implemented and Qt3D just need to use the RHI API to support 1D and 2D texture arrays. [ChangeLog] Enable texture array on the RHI render plugin Fixes: QTBUG-116354 Change-Id: I75c6c03ddf388eef3e4899fa772f77d3dac2a931 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 781c07e2a17a4927ec9a6e1648af3de9ec492d7c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-08-251-4/+4
| | | | | Change-Id: If7164497f42c5f0695ae056488a1f01728d10622 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-08-241-4/+4
| | | | | Change-Id: I70c14665a5f02e67925ae7918fb0aaa558181c9a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-08-231-4/+4
| | | | | Change-Id: Ib68d3d41f199e5470a87fad74a9a46555f26d38b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-08-221-4/+4
| | | | | Change-Id: I6fe1ff9d62422ce8d207b933fe882e4f66374bb8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-08-211-4/+4
| | | | | Change-Id: I942795a73c11f45af1931f4ede0eea7bbe5bfb75 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Use correct module namePaul Wicking2023-08-211-1/+1
| | | | | | | | | | | | The Qt3DCore module documentation uses incorrect capitalization for its CMake package name. Use capitalization from the `qt_internal_add_module` call in `qt3d.git/src/core/CMakeLists.txt`. Fixes: QTBUG-116229 Change-Id: If6f68088cc6559cb252b7cf46f2b96c7e4557c3c Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io> (cherry picked from commit 903e84629e3e44253d48dfdae81de2078597f1f4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-08-161-4/+4
| | | | | Change-Id: I90f1098c549f7d8381d40cff3c1f45e9778086b5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-08-111-4/+4
| | | | | Change-Id: I4cdeb1e9cc23dadf94ca166778efafd146f3fdec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Add example categories for Qt 3D examplesMats Honkamaa2023-08-117-0/+7
| | | | | | | | Task-number: QTBUG-115985 Change-Id: I1064f04d39d59146e4b5af70403853ad65d12efa Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 59cb54aab9b3bd412c7face68927795a5ef14954) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix UB (signed char passed to <cctype> function)Marc Mutz2023-08-071-1/+1
| | | | | | | | | | | | | | | Passing char to a <cctype> function is UB for characters that are outside the range [0...255, EOF]. You have to cast chars to uchar so the implicit conversion to int does not produce negative values. Amends a6ffce09ce6d4fd39fbb50eb58f7b5d1027f4d60. Change-Id: I597ee3ff87d38c40dbdf794ee07d302da26f520e Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit cf084d958c1d795fbdc06b6a377ab61d68e0960a) Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-08-041-4/+4
| | | | | Change-Id: Ia9b26ee4d462b158f2a092ca9cf32fb7432f5da9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-08-021-4/+4
| | | | | Change-Id: I8fb15a8c5a07db88aefe54daca3427bd60ffe881 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-08-011-4/+4
| | | | | Change-Id: I9c821802fc30c38f7b1411be9fc1a9755dfa1103 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-07-281-4/+4
| | | | | Change-Id: Ia916cc13512f35cb7d05cfa6472a8209dfc603e4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* GLTFImporter: fix crash when no material matchesAurélien Brooke2023-07-211-2/+2
| | | | | | | | | | Don't call renameFromJson(jsonObj, mat) with a nullptr mat. Fixes: QTBUG-100386 Change-Id: Ib35cd34212db6a309f629eabc93c19a69957eaf7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 670144a660823238ca286d5b631c9e1ae7dd8f00) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qt3dwindow: request Direct3DSurface when requesting d3d11Paul Lemire2023-07-201-1/+1
| | | | | | | Change-Id: I0c6f179d6663f74dbc709f1ef4fbe9ef7ce97901 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 1ef8b39dd9357aae347650937d730e3d29696807) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-07-171-4/+4
| | | | | Change-Id: I19fc78cdb0d396ba548f79fc504737c7c2a1816a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-07-141-4/+4
| | | | | Change-Id: I142bfef6e0c7ea4da79656ea9569c08ac6ef5a3c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-07-131-4/+4
| | | | | Change-Id: I10122440bb45b259faa3148e132118b402312677 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.5.3Jani Heikkinen2023-06-222-2/+2
| | | | | Change-Id: Ie81a081e3e4841c3a502b6cf6a90c9d94d7eab18 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-06-221-4/+4
| | | | | Change-Id: If3b481c8cc0ea053fc7e1973be4a9de9b33fb01c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-06-141-4/+4
| | | | | Change-Id: I13fd8fb3c05debec1c869aa7b1cc0add7abb6805 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-06-131-4/+4
| | | | | Change-Id: I064d8cfa436e6f32b93f6d30be0ef1cdc639b0df Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* ObjGeometryLoader: fix out-of-bounds accessesAurélien Brooke2023-06-121-1/+10
| | | | | | | | | | | | | We were reading values before the beginning of the array. "Conditional jump or move depends on uninitialised value(s)" Check the value of lineSize before using it as an index. Fixes: QTBUG-97751 Change-Id: I57c4f36973f3d5a6f9aecf4d22626af3e29f71f4 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit c1c07cb434fe4ead401e70d4fae7000ba6c50c76) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-06-091-4/+4
| | | | | Change-Id: Ie8c078ab2ade8b77367ff5e7d236dd68c021cf2e 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-29 03:18:19 +0000