aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.14' into ↵v5.15.14-lts-lgpl5.15Tarja Sundqvist2024-05-087-27/+40
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I68699c9336886106a939f34d35dc62f8207a0d69
| * Fix crash when a custom material / effect shader variable changesTomi Korpipaa2023-04-202-20/+28
| | | | | | | | | | | | | | | | | | | | | | We ended up deleting valid commands in cases where a shader variable changed without the custom material or effect being deleted. Just redo the to-be-deleted command list in updateSpatialNode instead of deleting it. Fixes: QTBUG-112969 Change-Id: Iec9bc584711325052f27353587632c4399b1fe4d Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * Skip processing unknown uniformsInho Lee2023-04-193-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While processing shader uniforms, it can face vendor specific uniforms. Quick3D will skip them because they are not interesting in the pipeline. And for GL_TEXTURE_2D_MULTISAMPLE, pnames which are related with sampler states, are not allowed. So, they will not be set. Fixes: QTBUG-110039 Change-Id: I2f5b6e0103defbcac6890fd1d0c99dffe78c4b36 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * Fix progressive anti-aliasing for PrincipledMaterialTomi Korpipaa2023-03-301-2/+5
| | | | | | | | | | | | Fixes: QTBUG-112263 Change-Id: Ib1b716bf19ac789a35962b7496e33534bc497ec7 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
| * Bump version to 5.15.14Tarja Sundqvist2023-03-011-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into ↵v5.15.13-lts-lgplTarja Sundqvist2024-01-041-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Iac552181b751d97fcc4a1fe116207ea95e4a958b
| * Bump version to 5.15.13Tarja Sundqvist2022-12-221-1/+1
| | | | | | | | | | Change-Id: I80b981d41e524173ac9111b52dfd109e53e93f4b Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into ↵v5.15.12-lts-lgplTarja Sundqvist2023-10-1110-6/+58
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I1b24b15ba52b64a30fced9e5d863f42c49534a66
| * Fix memory leak when destroying View3DJonas Karlsson2022-10-203-4/+19
| | | | | | | | | | | | | | | | | | | | Basically a cherry-pick of change I016b6c98901346153c64e865ae6d0177fae3d962 in Qt 6 branch Fixes: QTBUG-97680 Change-Id: Ic8c9d3c75905da1b547ecc2e6589136f28c5412a Reviewed-by: Christian Strømme <christian.stromme@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * Add missing command deletesJonas Karlsson2022-10-205-1/+37
| | | | | | | | | | | | Task-number: QTBUG-97680 Change-Id: Ib481d7ce6ce3e91d9cdb22f09747ba3f150dfe19 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
| * Add missing freeJonas Karlsson2022-10-201-0/+1
| | | | | | | | | | | | Task-number: QTBUG-97680 Change-Id: I6f12a107d00d6db6363d7aec27cf6fd8dc6f2ffb Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
| * Bump version to 5.15.12Tarja Sundqvist2022-10-061-1/+1
| | | | | | | | Change-Id: I89fb6c4d60f47870b08c15e14d296a9a2a7d8948
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-094-1/+12
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Icb2df955e6a800182adde39375ffad22dd79c30d
| * Apply texture parameters for fbo texturesAntti Määttä2022-06-233-0/+11
| | | | | | | | | | | | | | | | | | Not doing this causes the texture to be incomplete. Fixes: QTBUG-103866 Change-Id: Ifafb0a189b7bd92cad4081af74959197ab917558 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
| * Bump versionTarja Sundqvist2022-06-151-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into ↵v5.15.10-lts-lgplTarja Sundqvist2023-04-245-2/+10
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I4bb6db168d46ee76a1bbe0078f6d943c666ca689
| * Drive-by doc fixPaul Olav Tvete2022-05-071-1/+1
| | | | | | | | | | | | | | Change-Id: I4eff25b88d3dca83be2542732d080af99955470b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 43735c3d54b390f60fe4fbd5c4db6378418d3000) Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * Bump versionTarja Sundqvist2022-04-061-1/+1
| |
| * Clear layer resources when scene gets destroyedAntti Määttä2022-04-043-0/+8
| | | | | | | | | | | | | | | | | | | | | | Fix memory leak in layer resources when the same window and render context is used to load and render multiple scenes and then deleted. The layer resources do not get destroyed when the scene is destroyed so add new function to release them. Fixes: QTBUG-97714 Change-Id: I643f4912869a39657a696026fddb0c5b9fe6b902 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgplTarja Sundqvist2023-03-233-2/+21
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I9805b7fa417d8776ac3518e5a2c35b11f08626df
| * QQuick3DNode: Fix application order of local/parent rotation matricesYuya Nishihara2022-03-102-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes Node.sceneRotation of non-uniform scaling but uniform regarding the rotation axis. The original application order was just wrong since our convention is Mscene = Mparent ... * Mlocal. I'm not sure what is expected if the rotation plane is scaled non-uniformly. The current implementation appears to ignore the scaling. Task-number: QTBUG-101371 Change-Id: Ideef5936b77e1fa05891af541e09fc6b242daa8b Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Inho Lee <inho.lee@qt.io> (cherry picked from commit 160fc912b462c89626b47cd7c3ecbb0dad5182ac) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-103-3/+4
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I3bb9dee211f20ae0e5c8fc37b788ef3d0df1c8e1
| * Clean dirty nodes when deleting resourcesAntti Määttä2021-12-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | cleanDirtyNodes needs to be called before deleting resources so that the backend nodes and resources get destroyed. Otherwise unused resources can't be released. Fixes: QTBUG-97714 Change-Id: Id788c7cd166b6b90c6798d84c3fcd3f0c95df807 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * Assimp: Don't use multi-arg QString::arg(..)Andy Nichols2021-11-181-2/+2
| | | | | | | | | | Change-Id: I873621b9e1cadb439f0d8df7ad360154e3e10955 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-122-1/+19
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I1cb7079469d6908f48338163f51ac8144b49654a
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: Id174aa960fc2d4695de67326871789fa13acd9fb
| * Doc: Add \qmltype so Quaternion functions are collected by qdocYuya Nishihara2021-08-251-0/+18
| | | | | | | | | | | | | | | | | | | | These singleton functions are available since Qt 5.15.0, but not properly documented due to the lack of the \qmltype command. Change-Id: If58f692a97a6ce344c52d6afcdbb88fb3fa433f5 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit c98b40cd39605b401700023b8b76e088df45cf1d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-16142-3412/+4249
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I7d869240a6db633b05d03d09071635428e285475
| * PropertyEditor: Update designer specificsHenning Gruendl2021-08-05139-4727/+5575
| | | | | | | | | | | | | | Task-number: QDS-4736 Change-Id: I8e9d3e0388b774bf50266beb3707694a338e8f3f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * Doc: Fix application order of Node.eulerRotationYuya Nishihara2021-07-151-1/+3
| | | | | | | | | | | | | | | | | | Since we use QQuaternion for conversion, the order should be z, x, y. Change-Id: I82e77241ace7890d75e07486285b871643196b8f Reviewed-by: Inho Lee <inho.lee@qt.io> (cherry picked from commit e81e566408e18cbf4ee88fee66b373c61c324d1b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
| * QtQuic3D AssimpImporter: use quaternion by defaultInho Lee2021-06-041-33/+20
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-91495 Change-Id: I0d665bfdffd563d04addc4ea21651c4a3a5ef15d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit 951e81a7b5c1e6b498c27da248f7cb3ac9803848) Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-05-1916-70/+122
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I53b2db5ca4ea833fb5a054be8791c556f31a75c9
| * Handle 1bpp images in texture loadingEirik Aavitsland2021-05-251-0/+2
| | | | | | | | | | | | | | | | Backport of a Qt 6 change from 0b42acf9db54d640f352ef94830c019ec0ab3b15 Fixes: QTBUG-93864 Change-Id: If0f29c018ff8a4517c41b2613d282888e1fd920e Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: Ic50e4fed9a5602b0bb02300ca042f036a60ed48e
| * Handle opacityMap with NoLightingTomi Korpipaa2021-05-071-1/+27
| | | | | | | | | | | | | | | | All other maps were ignored with NoLighting but diffuse/baseColor. Fixes: QTBUG-90677 Change-Id: I8b520de5398f8bbe6ea5c9d7363cf76740f88fc0 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * Add more error checking for shader cache importAntti Määttä2021-05-064-13/+26
| | | | | | | | | | | | Fixes: QTBUG-89681 Change-Id: I2a9e5d4e6e5c3ae107b924b1130e1d33dd423e34 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * Make IdComboBox compatible with both Qt6 and Qt5 creatorMiikka Heikkinen2021-05-062-6/+6
| | | | | | | | | | | | | | | | Change-Id: Ib20db68953d2703dc7f1473e30477bf91b66d0c3 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit c93f9ecb3f89834bb554556eacf699f6dd091b84) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Fix writing compressed shader cache dataAntti Määttä2021-05-051-1/+1
| | | | | | | | | | | | Fixes: QTBUG-93445 Change-Id: Ifcf5bfd48caab2eb460cec4fed0a7e1810ed60db Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * Introduce some civilization to QQuick3DShaderUtilsRenderPass::m_shadersUlf Hermann2021-05-044-41/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the underlying container for the list property private, and actually append when asked to append. Provide a separate method to retrieve a shader by stage. This is already fixed in a different way in Qt6. Unfortunately the code there has diverged quite a bit, which makes backporting the change impossible. Fixes: QTBUG-93410 Change-Id: I69e62d1c28bb9b601078103443e4b24550225f2b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
| * Only try and use valid asset import pluginsAndy Nichols2021-05-031-4/+8
| | | | | | | | | | | | | | | | | | | | | | If we try a key that doesn't exist, then this would return nullptr, but then we deference that so it causes a crash. Fixes: QTBUG-90564 Change-Id: I4218c480a4252b8c7f0d2bef48fbe1c1fa52b8a9 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit b75f95fd8f39aa186c69d1dbc1bef06c293d716b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Fix bounds for imported objectsPaul Olav Tvete2021-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | updateBoundingBoxes needs the spatial node. That is set in updateDirtyNodes. For imported scenes, the order of the functions was opposite from the normal case. Fixes: QTBUG-90817 Change-Id: Ic1fe8c93faa1ab995c9aab65027c50e56d35ff2e Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * Check if sceneBounds is finiteTomi Korpipaa2021-05-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | Prevent trying to perform operations with extents if the bounds are not finite. Fixes: QTBUG-91718 Change-Id: I56e1ab2d0438232eeca2d0d5a2be166e18132b03 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-071-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I2cc187c368463877e7800bceb629b6cc41f695cd
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: Ic4f2f3746ffebff872c83018d739df795bb6a1ea
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-22493-5423/+5423
|/ | | | | | | | | | | This reverts commit c7ca1a4fe3fb4b1f6a689ed6b7d8c7dbbdebedd8. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I6f69825cd8b7d79bfda126a4cc463c0e618ce496 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Update designer light iconsMiikka Heikkinen2021-02-0517-11/+20
| | | | | | Task-number: QDS-3591 Change-Id: Id78d9f59575ac00dc8aaf124daacacb5bac8a60d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Update commercial license headersTarja Sundqvist2021-01-26493-5423/+5423
| | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtquick3d. Examples, tests or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the previous license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4224 Change-Id: Iee29706b3f4288ef75570213fa281ed2c28fef0f Reviewed-by: Antti Kokko <antti.kokko@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 01:56:40 +0000