summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.5.1' in qt/qt3d6.5.1Qt Submodule Update Bot2023-05-161-4/+4
| | | | | Change-Id: Id424737473d596ce608a75754e4fa1a0297337d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.1' in qt/qt3dQt Submodule Update Bot2023-05-161-1/+1
| | | | | Change-Id: Ifa35bd9fb6b05c9856ddfd8edf8470a0766500f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.1' in qt/qt3dQt Submodule Update Bot2023-05-151-4/+4
| | | | | Change-Id: I4b1c93b6cdee1f5cfea83b42b0e27ad4328fc84e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.1' in qt/qt3dQt Submodule Update Bot2023-05-111-4/+4
| | | | | Change-Id: Iea30686117943fde429988b57523a645c8903c7a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.1' in qt/qt3dQt Submodule Update Bot2023-05-051-4/+4
| | | | | Change-Id: Ia1580c2b02e59b6fe693fad93d0552f9a4299069 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-05-011-4/+4
| | | | | Change-Id: Ieeadfeb195d03a3604d6a1bb137b36009750772b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Doc: Add tests/manual in exampledirs to fix broken links"Topi Reinio2023-04-291-2/+1
| | | | | | | | | | | | | | | | | This reverts commit dee62f491a761cc860e5377746264d9e2990eca2. Adding the manual tests as 'exampledirs' makes QDoc parse the example documentation and also adds broken entries to the examples-manifest.xml. We do not want the examples from /tests to generate documentation or appear in Qt Creator. Revert the change, and address the QDoc warnings that this commit tried to fix by other means. Change-Id: I848344ae0836e341fabda5b740162b0015f6baf1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io> (cherry picked from commit a0555349e67cd420c2d8c0277b646525b0bca589) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-04-281-4/+4
| | | | | Change-Id: Ieddccb012cf03fb83eeae9a380725d7413f75487 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-04-261-4/+4
| | | | | Change-Id: Ib062dd0f7059d2133c448b51f26fd3e1ebc1df86 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-04-201-4/+4
| | | | | Change-Id: I4881985f229773d9e153b0b2bc10ad106dd1f6ad Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Make 'struct Light' to support std140Inho Lee2023-04-201-1/+4
| | | | | | | | | | | | | | Properties' offsets are not properly set for std140 standard. And they are not compatible to what the host machine supposes. Since the layout can be translated differently according to the graphics backend, it's safe to add paddings. Fixes: QTBUG-110128 Change-Id: Ib0748f5b0476543ecd2e42252c434bcf4b371786 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit ae363c23a48b817edb4a46e067437262edb7fa86) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix valgrind issue in GeometryRendererFriedemann Kleint2023-04-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | Initialize member hasView, fixing: ==20448== Conditional jump or move depends on uninitialised value(s) ==20448== Uninitialised value was created by a heap allocation ==20448== at 0x484DE30: memalign (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so) ==20448== by 0x484DF92: posix_memalign (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so) ==20448== by 0x4DC9DEE: _mm_malloc (mm_malloc.h:45) ==20448== by 0x4DC9DEE: Qt3DCore::AlignedAllocator::allocate(unsigned int) (qresourcemanager.cpp:63) ==20448== by 0x4B45C7F: allocateBucket (qresourcemanager_p.h:265) ==20448== by 0x4B45C7F: allocateResource (qresourcemanager_p.h:202) ==20448== by 0x4B45C7F: getOrAcquireHandle (qresourcemanager_p.h:369) ==20448== by 0x4B45C7F: getOrCreateResource (qresourcemanager_p.h:396) ==20448== by 0x4B45C7F: Qt3DRender::Render::GeometryRendererFunctor::create(Qt3DCore::QNodeId) const (geometryrenderer.cpp:191) Task-number: QTBUG-112914 Change-Id: I7e55a782c85cbbdd538eab0a775a5aaa0f6d4b4c Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 9a21c69f67110e84c01645564cecce7099600152) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-04-191-4/+4
| | | | | Change-Id: I95d28cde8a20736ecd79b36ebddbc3ecd1711eea Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-04-181-4/+4
| | | | | Change-Id: I423f370132d69695dfe697e1c49565db49063eb9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Resolve QTransform symbol ambiguity in unity buildAmir Masoud Abdol2023-04-147-138/+149
| | | | | | | | | | | | | Without this fix, when using unity build, qt3d mixes its symbol with qtbase, ie., `QTransform` in `src/gui/kernel/qinputmethod.h`, and `src/gui/kernel/qscreen.h`. Task-number: QTBUG-109394 Change-Id: Ibab5c7ec21bed20e1ca3058e586b38598d992b17 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit f16575c6f1733dede8565bb3509664e9bb9d0cd5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Enable build of Assimp on iOS and tvOSAurélien Brooke2023-04-131-1/+1
| | | | | | | | | It compiles and runs perfectly fine. Change-Id: Id733074567173ee9846e215687a0ab9950c9ab54 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 753efa984eb351429d56983e2ad988d1d29ef1d6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-04-131-4/+4
| | | | | Change-Id: I6738d980e8f9e9647c3077546b6a6395a67bcdcb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Silence warning about unsafe sprintf, use snprintf insteadAmir Masoud Abdol2023-04-131-5/+1
| | | | | | | | | | | | Apple Clang, and clang also complains about this, and warnings like this tend to break the unity build in certain situation. So, if possible, I rather address them. Task-number: QTBUG-109394 Change-Id: I8e24267a1ebfc0c3ff4f2f8afdcb7c6aed62db80 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit a8d90a776ead891b8eedf25979c6ef4cccb6fe49) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PlatformSurfaceFilter: fix crash when Scene3D is destroyed after windowAurélien Brooke2023-04-131-1/+2
| | | | | | | | | | | | | | | When closing a window containing a Scene3D, the aspect engine is destroyed after the QWindow (because of delete later), so the m_obj pointer we store inside the PlatformSurfaceFilter becomes dangling, leading to a crash in the destructor. Use QPointer to ensure m_obj it set null when it is destroyed. Fixes: QTBUG-111325 Change-Id: Icf153700a5708abff4b92b14ce2f9bb12d8653eb Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 2c3ebe01cb2875bfe48af20446b8c2b62ff49382) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* RHI: generate GLSL shaders of correct version when running on OpenGL ESAurélien Brooke2023-04-131-15/+34
| | | | | | | | | | | | | | | | | | OpenGL ES has different shader versions than Desktop OpenGL, which the existing code was not accounting for. Check if we are running OpenGL ES to choose the proper GLSL version, and add the flag QShaderVersion::GlslEs. This fixes errors like this when running on Android: No GLSL shader code found (versions tried: QList(320, 310, 300, 100) ) in baked shader QShader(stage=0 shaders=QList(ShaderKey(1 Version(120 QFlags()) 0)) desc.isValid=true) Change-Id: I6b387962e5cf48cdb0aec8ac3e8348d7847fc20a Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 57f190ddfe396d61b7ed284aae263dfeedc8f666) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-04-121-4/+4
| | | | | Change-Id: I263b914a2e298c2c1f979e5b06acdbb3ccfd774f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Resolve duplicate symbol error for `memoryBarrierGLBitfield`Amir Masoud Abdol2023-04-112-4/+4
| | | | | | | | | | | I slightly modified the function name to avoid the collision during the unity build. Task-number: QTBUG-109394 Change-Id: I1f1ffedc4ecb277a377569b47ee24d4657ceebe5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 2bd0f6344008626ae3971d6cc1a0e875c18c11c2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump version to 6.5.1Jani Heikkinen2023-04-042-2/+2
| | | | | Change-Id: I400b591ac72644dbba47590fe05be07168daa681 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-04-041-4/+4
| | | | | Change-Id: I1ce5e563f4963b7522c1424a9fe7dd291952b169 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-03-221-4/+4
| | | | | Change-Id: Ifed24b35265835014391a34f761b57baa834695e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Add tests/manual in exampledirs to fix broken linksAndreas Eliasson2023-03-221-1/+2
| | | | | | | | | | | Some of the examples were moved from the examples dir to the tests dir to reduce maintenance. After this move, however, qdoc cannot find the examples. Change-Id: Ie67d83c695504901fced4a85293ad344beafeead Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io> (cherry picked from commit dee62f491a761cc860e5377746264d9e2990eca2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Scene3D: fix crash in setItemAreaAndDevicePixelRatio when entity is nullAurélien Brooke2023-03-201-2/+5
| | | | | | | Change-Id: Ib4ced4fa56fb038b5ee440e0f4e752b2d2570abe Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 0e66d82ec30eb1800774e121c534579181aa6d07) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-03-201-4/+4
| | | | | Change-Id: I1618c75fb2b49798a86c6cbe5980a8d33ca77422 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Restore missing assetsMike Krus2023-03-1755-186/+247724
| | | | | | | | | | Got removed erroneously when moving stuff to manual tests. Task-number: QTBUG-111980 Change-Id: I66cd16ea570b77825987a9297d317e03a0789d67 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 437267f14978b95ccde2589cf5f0b3dcf2e1be2c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove links to old examplesMike Krus2023-03-171-5/+1
| | | | | | | | | Those have been moved to manual tests Change-Id: Ifede716b69b003c7523ae21ee5f9668dbad6f5a3 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 201ce3b861082e230a4a6dc52530c3a58886164d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix missing imagesKai Köhne2023-03-122-0/+0
| | | | | | | | | | | | | | | | | Commit 00d139e3 moved both images from examples to tests/manual. This resulted in qdoc not finding the image anymore: Warning: The file C:/dev/qt/dev/msvc-2022-amd64/qtbase/doc/qt3d/images/shadowmapping-depth.png does not exist, skipping it... Warning: The file C:/dev/qt/dev/msvc-2022-amd64/qtbase/doc/qt3d/images/shadowmapping-qt3d.png does not exist, skipping it... Fix this by adding a copy of the files todoc/qt3d/images. Since this is an identical copy, git should be clever enough to not duplicate the actual content. Change-Id: I6e2b753946d8195e008ce812f107ce72db41a32c Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 67c33648e6f444c0df0b2fb041fa10dc9946998e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-03-111-4/+4
| | | | | Change-Id: I7a18e12a5baaf9a48b9ac4350d8c2a5a383f108d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Replace \quotefromfile with \snippet to make code left-alignedAndreas Eliasson2023-03-107-25/+21
| | | | | | | | | | | | | | | The \quotefromfile command is smart enough to keep the left indentation from the source file when it renders the code in a code snippet in a qdoc file. This is all good when you're listing multiple code snippets and you can clearly see the left-most-aligned code, or 'starting point'. However, when you use \quotefromfile for a single code snippet that is indented in the source file, the rendered code in the qdoc file is not left-aligned - and this looks a bit odd. Change-Id: Ie6d2445b37faa4a75749d6013001892de012a1ef Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 5859a840c3f21b36d4c7849c173c38e16ef52fd2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-03-081-4/+4
| | | | | Change-Id: I2493203c8913355afcfca72366f1736e5608d2cb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-03-061-4/+4
| | | | | Change-Id: Icc20cd458e033ab036f23063784c4910359b0f86 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-03-021-4/+4
| | | | | Change-Id: Idb17c7a8ec6f8b7af51266420de17e2c60c57d35 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-03-011-4/+4
| | | | | Change-Id: I9cad60bb0af6d92705307a8c8d5fa5c16588326a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Merge both controls based examplesMike Krus2023-03-0110-4447/+38
| | | | | | | | | Can toggle underlay mode from main.cpp. Change-Id: Id3ef156b0df9b30dd9d7d3620a2878e70434d69b Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 6c1155f6ac4e8baa554a55b915eca0add4030d07) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Move some examples to manual testsMike Krus2023-02-27377-305266/+471
| | | | | | | | | | | Reduces the maintenance burden. Also fixed a few issues when moving code. Change-Id: I647f0c1a215f27a0e834d328ca64cfb570639b04 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 00d139e39f675c32d6b8202900a0d8d5706ee8e3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Exclude Assimp from Unity BuildAmir Masoud Abdol2023-02-261-0/+1
| | | | | | | | | Task-number: QTBUG-109394 Change-Id: Ifb061194f34ffdeded0e264f870f2d8328f2f9e7 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 3f35ee5b3652582968adb57c5042a29a458f22a6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* OpenGL SubmissionContext: reset m_renderTargetFormat for default FBOPaul Lemire2023-02-241-1/+5
| | | | | | | | | | | | | | | | | | | | | We rely on m_renderTargetFormat when doing render capture to know in whick internal format the currently bound FBO is. m_renderTargetFormat is reset once per surface change based on the QSurfaceFormat. However, when using custom RenderTargets, it gets overwritten in the call to SubmissionContext::activateRenderTarget which happens for each RenderView. If we switch back to the default FBO in a RenderView that follows one using a custom RenderTarget, both using the same surface, we failed to reset the m_renderTargetFormat and it would mistakenly remain to the value set for the custom RenderTarget. If a RenderCapture were to happen at that stage, this would lead to crashes as we would compute the capture buffer assuming a format that doesn't match that of the current FBO. Change-Id: I5c722f20857b23b5696617065c8f50406e10aea9 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 77823b3b678a586f90d1211fa27dddfbf1fe4e71) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-02-241-4/+4
| | | | | Change-Id: If11cb1c774f7d3a211cd7df3964d39fd21733120 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove scene2d example and manual testMike Krus2023-02-2316-4814/+0
| | | | | | | | | Not supported in Qt6 Change-Id: Id33603d3b88e0eda1ae27e6ed4b8d08e2e0c91c7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit d1e1ccc8f92b12779a1adab853202bc48f8a1cad) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* TriangleCollisionVisitor: perform intersections tests in local spacePaul Lemire2023-02-211-11/+9
| | | | | | | | | | | | Rather than multiply each triangle vertex by a mat4 to bring them to world space (which is actually costlier than the actual intersection test), we compute a local ray once and use it to test against the local vertices. Change-Id: I4de9da278186f8214c32be394beb09daa9bc4914 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 675c2b852869b8b6126f380148d9e0cfe6487506) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dv6.5.0-beta3Qt Submodule Update Bot2023-02-171-4/+4
| | | | | Change-Id: I1ce26a7a9804a35b0cc8ebe6632eb3b3aa95584d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QDistanceFieldCache: fix QTextureAtlas dangling pointerPaul Lemire2023-02-142-3/+9
| | | | | | | | | | Note: already merged in 5.15 Change-Id: If968714f1ca4869e9c607224b537e355b4a6f0dd Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit b7e398620a5b467e5205722da5314938d1430f8e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Retire the qt_parse_all_argumentsAmir Masoud Abdol2023-02-103-3/+3
| | | | | | | | Task-number: QTBUG-99238 Change-Id: I5287ffb82104feb44fdf58383bf0a4766b066a6c Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 64696b16afe75e54d24792ffdf5e08f6a559523c) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-02-101-4/+4
| | | | | Change-Id: If6711c8a2eef73aac10e783c4c543845f8c89bb0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add some exclusions for CMake Unity (Jumbo) buildsFriedemann Kleint2023-02-105-0/+15
| | | | | | | | | | | | QtGui headers referencing QTransform clash with source files using namespace Qt3DCore. Task-number: QTBUG-109394 Change-Id: I17a4571ef4a69e1133b96442c309cd1f5f922a0c Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit d0b49441d348b60a87f845b2ad14a696021f605b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* quick3drender plugin: Disambiguate meta type id constantsFriedemann Kleint2023-02-102-6/+4
| | | | | | | | | | | | Make them function-local to prevent clashes in CMake Unity (Jumbo) builds, Task-number: QTBUG-109394 Change-Id: I3c42d2b2f45f5aef5f63ced4f68911d6d34a2884 Reviewed-by: Inho Lee <inho.lee@qt.io> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 8a0d1556600e8763e14bb0a9d3cd1a778acded3d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>