aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.7.0' in qt/qtquick3dv6.7.06.7.0Qt Submodule Update Bot2024-03-221-4/+4
| | | | | Change-Id: I3723a943fefdd074c628a9014bc1b78b262f0b9b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7.0' in qt/qtquick3dQt Submodule Update Bot2024-03-201-4/+4
| | | | | Change-Id: Ia376c9d4e086fc6319f2cabfe0e1ae0a3a320a95 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7.0' in qt/qtquick3dv6.7.0-rc2Qt Submodule Update Bot2024-03-191-4/+4
| | | | | Change-Id: Ied14066f3f7934bafdbe96ac013c53934996e876 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7.0' in qt/qtquick3dQt Submodule Update Bot2024-03-191-4/+4
| | | | | Change-Id: Id48692f4a497b05326430fd83f29259e3e555d4b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7.0' in qt/qtquick3dQt Submodule Update Bot2024-03-181-4/+4
| | | | | Change-Id: Id5092691090745ecadf50f3c9f8b286df6ece058 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Move examples to '3D' categoryTopi Reinio2024-03-1334-39/+39
| | | | | | | | | Task-number: QTBUG-122377 Change-Id: Ia2ba60f91d49527be40bc9dc94d3bbd875206c54 Reviewed-by: Jaishree Vyas <jaishree.vyas@qt.io> (cherry picked from commit 375d9fc51f3207fc287f0e69c50d9438a76efab5) Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 921f682bfff4ee672918db04987c63468246831d)
* Update dependencies on '6.7.0' in qt/qtquick3dv6.7.0-rc1Qt Submodule Update Bot2024-03-081-4/+4
| | | | | Change-Id: I8b4e994e3af5ed7dfcf12588476fd2c47aed7442 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7.0' in qt/qtquick3dQt Submodule Update Bot2024-03-071-4/+4
| | | | | Change-Id: Ifde136dc4da43ca539d5ba244c2282404e467bea Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix build-failure with no-qml-debugInho Lee2024-03-063-1/+9
| | | | | | | | | | | | A dependency on qml_debug was not properly set. Fixes: QTBUG-123015 Pick-to: 6.6 6.5 Change-Id: I238d538229d86f96a992221037485c23310ac4da Reviewed-by: Christian Strømme <christian.stromme@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> (cherry picked from commit aa937e6fb5c20dcd3d5d45d46cf3128f935c8b2c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtquick3dQt Submodule Update Bot2024-03-051-4/+4
| | | | | Change-Id: I9c9ccda9c1966ae6b322207f2ae5863f17ff8f35 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update to tinyexr v1.0.8Andy Nichols2024-03-052-4/+4
| | | | | | | | | Fixes: QTBUG-122921 Pick-to: 6.6 6.5 Change-Id: I5fe694f270537890ddc7a503a678001ca43bdb09 Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> (cherry picked from commit e96659c9c6f17dc0b7aeaa2846a48b021fd0edaf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtquick3dQt Submodule Update Bot2024-03-031-4/+4
| | | | | Change-Id: Ie816a7d55fa39331b51d9b81ca65d22fe8564c59 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtquick3dQt Submodule Update Bot2024-03-011-4/+4
| | | | | Change-Id: I5fc157f7afd583189a6551e7260c503b88226eb9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtquick3dQt Submodule Update Bot2024-03-011-4/+4
| | | | | Change-Id: I798d175bb8ba630cd2879fdc3fa8def1a11c42e3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Silence -Wimplicit-fallthrough for clangTim Blechmann2024-02-291-0/+1
| | | | | | | | | | Unlike gcc, clang warns about implicit fallthrough even if the following label only contains a `break` statement Change-Id: Id970770d6b336fbc1ce2574a8c3672d58d472055 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 408dd46bf4f044e851b6a94c021e251949bc6fbe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Move profiling message before endFrame callAntti Määttä2024-02-281-8/+8
| | | | | | | | | | | | | | The endFrame call sets the layerkey to nullptr effectively clearing the stats for the STAT_PAYLOAD in the profiling message. Move the profiling call before the endFrame so that the profiling message works correctly. Fixes: QTBUG-108755 Pick-to: 6.6 6.5 Change-Id: I4ac504a88d0e8618a94f957df1aa7cbdd0d22467 Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit cf55d0cb6fae673edc5a33e2e65af0f5556399ad) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtquick3dQt Submodule Update Bot2024-02-271-4/+4
| | | | | Change-Id: Ic659c9bb3665d0a919053a2b077396d7929aa4e0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* balsam/iblbaker: Destroy offscreensurface with OpenGLLaszlo Agocs2024-02-261-1/+3
| | | | | | | | | Fixes: QTBUG-122143 Pick-to: 6.6 6.5 Change-Id: I7af96ab6153acdf7d4467457177bbbaeb201b772 Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit 876118d48996f907342fadb83f162080a43ef479) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtquick3dQt Submodule Update Bot2024-02-231-4/+4
| | | | | Change-Id: I766e1b962f85bf4b3cc02aeb70d3cdf297700b9a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtquick3dQt Submodule Update Bot2024-02-211-4/+4
| | | | | Change-Id: Ic6b0419242e815d9c8cfd89198a0f457534ec509 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QmlDesigner: Change "Group" to "Node" in designer metainfoMiikka Heikkinen2024-02-191-1/+1
| | | | | | | | | Fixes: QDS-11396 Pick-to: 6.6 6.5 Change-Id: Iea22d8c1a37ad4aaf3526ca246edaf76743f52ef Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> (cherry picked from commit 941112bc06f9c5bc839ff4ebbc55344519c8d37d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtquick3dQt Submodule Update Bot2024-02-191-4/+4
| | | | | Change-Id: Ib69d6f435181130bb9436c9813595e322cc04c7a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix missing Q_REVISION in QQuick3DGeometryAndy Nichols2024-02-181-1/+1
| | | | | | | | | This was found in then QML API review process Change-Id: I7bd8e5a7f783ea2f96b039a7c3654016a184d6a3 Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> (cherry picked from commit b94d7a564e5fb0ae040918711b07a166867b43e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtquick3dQt Submodule Update Bot2024-02-151-4/+4
| | | | | Change-Id: I77cc1df61d59ecd139fe4d3b4d0a225a78fa5fa2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtquick3dv6.7.0-beta3Qt Submodule Update Bot2024-02-091-4/+4
| | | | | Change-Id: I6c55287275a1be4aef593e7e10686c7d363b6b2a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix dual-normal clear coat Schlick3Sadegh Taghavi2024-02-081-1/+1
| | | | | | | | | | Fix Clearcoat Schlick3 function Task-number: QTBUG-121175 Change-Id: I18df06a21934c65d8f2fd331d52f4cecb678a1cb Pick-to: 6.5 Reviewed-by: Andy Nichols <andy.nichols@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Update dependencies on '6.7' in qt/qtquick3dQt Submodule Update Bot2024-02-061-4/+4
| | | | | Change-Id: Ia4e0f80298f9b3ee31ff227b8f57b198f62d8171 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtquick3dQt Submodule Update Bot2024-02-051-4/+4
| | | | | Change-Id: Ibb8d944cd565b006c39fb94b0ab293c2c426113a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* fix clang's unused-private-fields warningTim Blechmann2024-02-024-5/+0
| | | | | | | | Pick-to: 6.6 Change-Id: Ic72393a71fbce1fe66eb9dfdeb42578f7aac126c Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit 68e3a3a3a90e6bc4c3993081c0a4d74b5c75d51c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* fix unity buildsTim Blechmann2024-02-027-8/+6
| | | | | | | | | | | * `Q_DECLARE_OPAQUE_POINTER` in header to avoid 'specialisation after instantiation' * prevent name clash of `ensureNormalized` Change-Id: I3fcbff6a16b29e2105d094c33944021a1a1afe24 Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit 918e778e2a3c96d2591e666e1f94473fc857fe01) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtquick3dQt Submodule Update Bot2024-02-011-4/+4
| | | | | Change-Id: I5b2800b8e570bd158d53113f35233dc1c6d85836 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Replace incorrect usage of NodeId for CameraIdChristian Strømme2024-01-309-18/+30
| | | | | | | | | | The camera is a node, but we should be using the QSSGCameraId when that is the known or expected type. Change-Id: Id441f79f553d0f03b50d5f10ebaed0266c2208f2 Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit 9eba936a8c45e845a09357f130742f4dbf6f822c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* [docs] SpecularGlossyMaterial: put value and description togetherJonas Karlsson2024-01-291-5/+2
| | | | | | | | | | Amends 575232910d1c1896332b6dde1c528f621da5173e. Pick-to: 6.6 6.5 Change-Id: Ic072d3c11191879c9b88ffcea827006321a8958c Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 9aeba34e1611ca2600368d79e6d39bb8f30b402f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix the stenciloutline exampleChristian Strømme2024-01-291-1/+2
| | | | | | | | | | | The qml files were added under RESOURCES and not QML_FILES. For some reason this worked on macOS, but not on Linux and Window. Fixes: QTBUG-121568 Change-Id: Iaf2c8991fb81975b20b3366a2b67e0bc53659b12 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 54072b67ef53f098de7e35025c2544631aaca27e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Detach QQuick3DWindowAttachment from QQuickWindow in destructorInho Lee2024-01-261-0/+3
| | | | | | | | | | | | | | While loading/unloading Quick3D repeatedly, a deleted windowAttachment can be accessed through QQuickWindow. Fixes: QTBUG-120424 Fixes: QTBUG-121390 Pick-to: 6.6 6.6.2 Change-Id: If53e20c2468d4a1f7656087e1d58976760db6d90 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit 45bcf958b7f937c52c9f4efa52828820b86942d5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Rename example target from content to robotassistantEdward Welbourne2024-01-263-5/+5
| | | | | | | | | | | | | The name "content" is far too generic and clashed with another example target in qtdoc (part of samegame). Although that's going away, let's avoid the over-generic name here, as well. Pick-to: 6.6 Change-Id: I2747f8f04e310ea7466e5a7f6567ea08976d9b0d Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit dc396b5c0285b2efa2c7a7f8f628c59ac8eb593e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update Assimp to v5.3.1Andy Nichols2024-01-246-366/+22
| | | | | | | | | | This update also removes the extra unzip.h header. Task-number: QTBUG-121336 Change-Id: Icf84b41a23db726d73cf9ff3bdf4ddf56dd633d1 Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit ae6ae7dbf7bb7b01a1efed997bc380da33d50444) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Improve the outline render extension documentationChristian Strømme2024-01-233-8/+20
| | | | | | | | | | Add missing steps for setting the extension property on the view and clean up some wording. Change-Id: I1d9143b1ca6055023e4759acdc645a8a40b3c762 Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit eb0cb9c102b27f1ce22b6696150354c17b8793ab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtquick3dv6.7.0-beta2Qt Submodule Update Bot2024-01-231-4/+4
| | | | | Change-Id: I558cd0da281419dda1de8154325bc5c462611cf1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix missing Q_REVISION(6.7) tags for new API's in 6.7Andy Nichols2024-01-222-5/+5
| | | | | | | | | Done as part of the API Review process. Change-Id: I0ac92c197003fd80f081fefe36a96b74f6ae4faf Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit 2ab65f8a45ae729ae58778e6a07ad294e118c75b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't remove the original renderable node when taken by an extensionChristian Strømme2024-01-222-6/+12
| | | | | | | | | | We shouldn't remove the original as we still want it to be available for all the other extensions. Change-Id: If164ae2a8ee9de5552c796ca43f2287426726c13 Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit 079de7419ed7747bac0b7930c24422ce5098f96f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Convert the stencil outline manual test into an exampleChristian Strømme2024-01-2226-728/+838
| | | | | | | | Task-number: QTBUG-116570 Change-Id: I4b610aedaa7181cb8dc27627129484926cc6cff5 Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit 01ba2a178f1e4100f4d70ad22f2acfcc802d81e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't do further work on extensions if the prep call returns falseChristian Strømme2024-01-221-2/+4
| | | | | | | | | | If the prepareData call returns false it means nothing changes or should be done, so make that's what we do. Change-Id: I7e0eea8f6b5463513d20d7d7daaf40eb2c064bce Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit a614f98937f076d19cdbddce62361adb5df918b7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* WasdController: Ignore auto-repeat key eventsJonas Karlsson2024-01-221-2/+2
| | | | | | | | | | | | | | When holding a key down, auto-repeat key events will be sent. These alternate between pressed and released events causing jitter on the moved object (usually the camera). Instead we just ignore these events. Task-number: QTBUG-120109 Pick-to: 6.6 6.5 6.2 5.15 Change-Id: I0213e6e8902e36228b66ab4e2e2f3744c6e4a9df Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit af356d8dd209816acbfef132605db98ccf109077) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Expand the documentation for the Create flag in QSSGRenderHelpersChristian Strømme2024-01-221-3/+6
| | | | | | | | | There was no explanation of what the different flags meant. Change-Id: Id66236001f804c34bccceb6a6bd9d995f2b7820b Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> (cherry picked from commit 5937a6917525afe6e5aaa2880a243b3413059e52) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtquick3dQt Submodule Update Bot2024-01-201-4/+4
| | | | | Change-Id: I07dda03899480b1ea775a65b9e81a39e95358a1e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtquick3dQt Submodule Update Bot2024-01-191-4/+4
| | | | | Change-Id: I9432901a8a11e32bc7d2122244c956b4e6081bf4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtquick3dQt Submodule Update Bot2024-01-181-4/+4
| | | | | Change-Id: Ic72163a6c9083b46e3158a75c11e93fd1d540138 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Robustify lightmapper blendLine functionKristoffer Skau2024-01-181-3/+8
| | | | | | | | | | | | | | | | | QVector2D::operator/= asserts to avoid a division by zero, this is called during the post process step in the blendLine() function. This assert seems to be triggered in some cases, so far only on MSVC. This was reproducible consistently when Model source was set to the primitive types #Cone and #Cylinder. Changed from using the QVector2D overload to doing the division manually, but only in the case where it's valid to do so, to keep the current logic and output the same. Fixes: QTBUG-120629 Pick-to: 6.6 Change-Id: Ic15c4f2a9523b83cb4bf256016aa78a49542c82b Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> (cherry picked from commit 58dc732e6e735be927f5eba65874a409bc1492fa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuick3DGeometry: add 'geometryChanged()' signalJonas Karlsson2024-01-182-0/+2
| | | | | | | | | | | | This signal is useful in QQ3DPhysics where a geometry can be used as the source for a collision mesh. It therefore needs a signal for when the contents of the geometry is changed. Task-number: QTBUG-109818 Change-Id: I4fd768e004981a0b1f7404a8a6181d1552cb2958 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit f1202c840b580642978d1be37dcede5ce6cd28c6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 01:14:47 +0000