summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.3' in qt/qt3dv6.3.0-alpha1Qt Submodule Update Bot2022-01-081-3/+3
| | | | | Change-Id: I552ca35b243a61bd5f197c169d44774fbfcd4592 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2022-01-061-3/+3
| | | | | Change-Id: I02606d8bb4c95ba7f287183fa67cce99d0b04ca5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2021-12-221-3/+3
| | | | | Change-Id: Idf5b47abed1b5fe5eec7f1eefc0f1ea7f1a12b66 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2021-12-211-3/+3
| | | | | Change-Id: I6243705e965ca7b93a50326bb281179821256416 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Move Qt::Concurrent to the PUBLIC link sectionAlexey Edelev2021-12-201-1/+1
| | | | | | | | | | | | | | | | | | This is the workaround of QTBUG-86533. The Qt6::Concurrent target needs to be added to the IMPORTED_LINK_DEPENDENT_LIBRARIES_RELWITHDEBINFO property of the exported Qt::3DCore target. This doesn't happen bacause Qt6::Concurrent is INTERFACE_LIBK_LIBRARY propagted by versionless Qt::Concurrent target. Qt::3DCore links Qt::Concurrent only and due to the issue in CMake, CMake skips adding Qt6::Concurrent to the IMPORTED_LINK_DEPENDENT_LIBRARIES_RELWITHDEBINFO list. The workaround propagates the Qt::Concurrent to the Qt::3DCore consumers explixitly as the interface link library. Change-Id: I5ecbc1c9c695bd2ce6022f123ff1496cce3ff32a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit c11447185bcfd33d9edbc9508d6de066c62c3e60) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Switch examples to build as isolated sub-buildsAlexandru Croitor2021-12-151-24/+24
| | | | | | | | Task-number: QTBUG-90820 Change-Id: I975f67a1899363687092b25d936c874163c661ea Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 7611c48f0c7fbebb33ffa3741de2d6eeb0663217) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-12-121-3/+3
| | | | | Change-Id: I31804a12d8626f6ca673f4a0dd4b21112071a4e8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-12-111-3/+3
| | | | | Change-Id: I53ba0180d7d343d24adfac19e15c14b25221b418 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Don't attempt to build pugixml.cppJoerg Bornemann2021-12-101-2/+1
| | | | | | | | | | | | | | | pugixml is configured as header-only library by default. We must not compile pugixml.cpp. The qmake project file listed pugixml.cpp as source file, but it was not compiled, because qmake automatically detected that pugixml.cpp is included by pugixml.hpp. CMake does not have this automatism. Pick-to: 6.2 Fixes: QTBUG-97254 Change-Id: Ibaf434f326d42e2fdea79f359cc625338644ce4d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-12-091-3/+3
| | | | | Change-Id: Ic1adbc2cb193f00f359d0a3439c5c9d5ed015792 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Clean up license filesKai Köhne2021-12-084-1155/+451
| | | | | | | | | Only include license files that are actually referenced in the source text. Pick-to: 6.2 Change-Id: I2d04ef581a0b34d9cace3d1a1a790233fd921e5a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-12-061-3/+3
| | | | | Change-Id: I700e4c7f03a6fa4998b3a0e01f5bb63eb090b935 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android: trim down the manifest file from unneeded tagsAssam Boudjelthia2021-12-031-44/+38
| | | | | | | | | | Follow-up to 468e4a8242da3e795fe0b218f97cfd97a1d7e032. Fixes: QTBUG-95439 Pick-to: 6.2 Change-Id: I1584ca4b29b25e669c8844be1a6941025c93288f Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-12-021-3/+3
| | | | | Change-Id: I3c27ef682c425022ec79f43ff6206faa3761c24e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* OpenGL renderer: restore surface on context when shutting downPaul Lemire2021-11-301-27/+39
| | | | | | | | | | | | | | | | | | | | | When using a QQuickWidget and Qt3D, on shutdown and assert occurs. This is the result of the QQuickWidget expecting the surface on the context to be its own internal surface after the QQuickRenderControl has been invalidated. This conflict with what Qt3D does on shutdown as it makes the context current on its own internal offscreen surface on shutdown. Therefore, to fix this issue, we record the surface in use before Qt3D shuts down and we make the context current on it after Qt3D has shutdown. Arguably, the fix should really go in QQuickWidgetPrivate::invalidateRenderControl where the QQuickWidget should check that the current surface is indeed the one it expects and set it accordingly. Change-Id: I534dc330a30a2ad5d17a6416715d03206ef4b1c9 Pick-to: 6.2 5.15 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-11-261-3/+3
| | | | | Change-Id: I0c208a3a619826c3e3a384860a6aeea22b14d795 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "AnimationClip: fix the way we compute the duration"Paul Lemire2021-11-261-7/+4
| | | | | | | | | | | | Turns out we want the global clip duration and not the relative clip duration. Therefore global clip duration is always computed from 0. If the first keyframe is offset, then this means animation does nothing until t=offset. This reverts commit 7b23cb1ca5b32fcf24f889e79cec756786f86233. Pick-to: 6.2 5.15 Change-Id: Ic045a3cdea5eac4b8e35b75737e3ae6f00b9fa20 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* CMake: Fix configuration error if libassimp-dev is installedJoerg Bornemann2021-11-251-0/+18
| | | | | | | | | | | | | | | | | | | | | On Debian-based Linux distributions, we got errors like Imported target "WrapQt3DAssimp::WrapQt3DAssimp" includes non-existent path "/usr/lib/include" if the libassimp-dev package was installed. This is due to a packaging problem as described in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=973361 Work around this issue by fixing the known wrong include path. Pick-to: 6.2 Task-number: QTBUG-98420 Change-Id: If0052d012132ffddc056e20f1f65bf13723b0219 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Doc: Replace use of \oldcode-\newcodeLuca Di Sera2021-11-251-3/+5
| | | | | | | | | | | The command-pair was recently deprecated. The replacement code should produce an output that is equal to the previous one. Task-number: QTBUG-98499 Change-Id: I31a7cf8cb29e76dd73b676039b87c108af1bd1af Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* RHI: Fix content not updated when using OnDemand and switching texturesPaul Lemire2021-11-241-0/+5
| | | | | | | | | | | | | When changing a Parameter whose value is a texture, it takes Qt3D potentially two frames to process the scene fully before it is able to draw the updated content. This patch makes it so that if we know we have the flags ParametersDirty for frame N, we request to reprocess the scene once more on frame N+1. Change-Id: I9df868ce2aac857bad1a1cb1074038b9c5bcd907 Pick-to: 6.2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* OpenGL: Fix content not updated when using OnDemand and switching texturesPaul Lemire2021-11-241-0/+5
| | | | | | | | | | | | | When changing a Parameter whose value is a texture, it takes Qt3D potentially two frames to process the scene fully before it is able to draw the updated content. This patch makes it so that if we know we have the flags ParametersDirty for frame N, we request to reprocess the scene once more on frame N+1. Change-Id: Ia635e324434f92f8423a68b72d99350d96830de6 Pick-to: 6.2 5.15 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* AnimationClip: fix the way we compute the durationPaul Lemire2021-11-241-4/+7
| | | | | | | | | We wrongly assumed the start time of a clip was always 0. In practice this might not be the case. Therefore, we now compute duration as tEnd - tStart. Change-Id: I13ca860f3366c2aba5e978cb0c955e7bb2e7bc39 Pick-to: 6.2 5.15 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move Q_DECLARE_PUBLIC to the public sectionThiago Macieira2021-11-232-0/+2
| | | | | | | This is now required to use QObjectPrivate::connect. Change-Id: Iccb47e5527544b6fbd75fffd16b8bd87f0818ad5 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Q*FActory: remove unused path argumentsThiago Macieira2021-11-2310-184/+23
| | | | | | | | | | Cargo-culted from somewhere but not used in any of these classes. This just made the code bigger for no reason. Task-number: QTBUG-97950 Pick-to: 6.2 Change-Id: Ice04365c72984d07a64dfffd16b48632888ed664 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix MSVC warning in opengl renderview.cppKai Köhne2021-11-221-1/+1
| | | | | | | | | Fix warnings like warning C4267: 'argument': conversion from 'size_t' to 'const int', possible loss of data Pick-to: 6.2 Change-Id: Ibfe45493a6627af6cedd0afa536d892ebd8be0e8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QGeometryFactory: don't make op== virtualMarc Mutz2021-11-174-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | That's too clever, and it backfires with compilation errors in C++20 mode: qt3d/tests/auto/render/meshfunctors/tst_meshfunctors.cpp:129:29: error: ambiguous overload for ‘operator==’ (operand types are ‘MeshFunctorA’ and ‘MeshFunctorB’) 129 | QVERIFY(!(*functorA == *functorB)); | ~~~~~~~~~ ^~ ~~~~~~~~~ | | | | MeshFunctorA MeshFunctorB qt3d/tests/auto/render/meshfunctors/tst_meshfunctors.cpp:72:10: note: candidate: ‘virtual bool MeshFunctorB::operator==(const Qt3DCore::QGeometryFactory&) const’ (reversed) 72 | bool operator ==(const Qt3DCore::QGeometryFactory &other) const override | ^~~~~~~~ qt3d/tests/auto/render/meshfunctors/tst_meshfunctors.cpp:50:10: note: candidate: ‘virtual bool MeshFunctorA::operator==(const Qt3DCore::QGeometryFactory&) const’ 50 | bool operator ==(const Qt3DCore::QGeometryFactory &other) const override | ^~~~~~~~ Fix by providing a symmetric operator== for QGeometryFactory that delegates to a virtual equals() method. Pick-to: 6.2 5.15 Change-Id: I23d29ad1b16075629132f2b4757c5810d5615a36 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix licensing headersMike Krus2021-11-173-12/+45
| | | | | | | | | Historical copy/paste error, now correct. Task-number: QTBUG-98097 Pick-to: 6.2 Change-Id: I2152fa8d974f26e2aa9e7e3d560a1e8270e7aaf1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-11-101-3/+3
| | | | | Change-Id: I0e616b53a2516addddd4af1f124ae981ddcc6332 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-11-041-3/+3
| | | | | Change-Id: I19a1446849fa061c0cc74efb8efae93534aab15c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "QVector<T>::const_iterator isn't always a const T*"Thiago Macieira2021-11-033-6/+3
| | | | | | | | | This reverts commit 1286bd5bf4348b52ec431be0c37197da9506df6e. Reason for revert: this change was binary-incompatible. Change-Id: Ic39284d5f8282ad4b175063220696ab60031c732 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix Compute-Manual manual testPaul Lemire2021-11-031-1/+0
| | | | | | Change-Id: I78c11accf69eb4ce8774885bce5303ef3c934926 Pick-to: 6.2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* ComputeCommand: call markDirty(ComputeDirty) when enabled changesPaul Lemire2021-11-032-0/+19
| | | | | | | | | | | | | | | | | | | | | | | When using Manual run mode on a QComputeCommand, we rely on the enabled property changing to enable/disable the backend ComputeCommand for a given set of frames. Since we weren't setting any dirty flag when the enabled property changed, Qt 3D was not rebuilding the list of active compute commands but rather using the one stored in its cache. This resulted in the ComputeCommand, now disabled, to still be called for execution until something else triggered a command rebuild. The renderer calls ComputeDirty after it has executed a compute call. This explains why eventually we only had 2 calls (and not a perpetual loop) when calling trigger(1). One was the valid call, followed by the invalid one (and then the command list got rebuilt because of the ComputeDirty flag set by the renderer). Task-number: QTBUG-86493 Change-Id: I7b31606a03609dc13294256b1dac89ee86730ba1 Pick-to: 6.2 5.15 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* ObjectPicker: markDirty(AllDirty) when we change the enabled propertyPaul Lemire2021-11-031-2/+7
| | | | | | | | | Otherwise we would simply change it internally but this wouldn't lead to any actual changes in how we handle pick events. Change-Id: I71aedc74db538978a939620d053af3167fd67dc4 Pick-to: 6.2 5.15 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix compilation with latest qtbaseKai Köhne2021-10-283-6/+6
| | | | | | | | | | Make the conversion from QList<Type>::const_iterator to Type* pointer explicit; since qtbase commit 0220484329029fc75, QList doesn't support the implicit conversion anymore. Fixes: QTBUG-97708 Change-Id: Ief96263871c5fd1179bf625d1c3d1c31c5def1c8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Adjust configure tests to ignore libs in /usr/local on macOSJoerg Bornemann2021-10-261-0/+7
| | | | | | | | | | | | On macOS, if pkg-config is not used, we modify CMAKE_SYSTEM_FRAMEWORK_PATH and CMAKE_SYSTEM_PREFIX_PATH to avoid picking up libs from homebrew or macports. This must be done in the configure tests too. Otherwise the find_package commands may return different things for configure tests and the Qt build itself. Task-number: QTBUG-97076 Change-Id: I91d51aac46e2be73186b49bdcc54fb640e9b0691 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* QVector<T>::const_iterator isn't always a const T*Ville Voutilainen2021-10-253-3/+6
| | | | | | | | This manifests on android developer builds, where the build of qt3d failed because of this. Change-Id: Ic3bce6880b0d73f03bb2e27db278edd2981b061e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Replace \qmlproperty Object with QtObjectIvan Tkachenko2021-10-212-3/+3
| | | | | Change-Id: I950b2d2fe2e749e3e4bf752f78cb57b7a2cbaeab Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-10-121-3/+3
| | | | | Change-Id: I7efaa729dc8f30d35cc25dc6542673e25f6cc3ab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-10-111-3/+3
| | | | | Change-Id: Iedadd3be059b84262161984bf1795e53a7e568aa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-10-081-3/+3
| | | | | Change-Id: I58a86daa0f94c16b8602d97e41fdfb5be04b15e6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix build on macOS if system assimp is installedJoerg Bornemann2021-10-081-0/+7
| | | | | | | | | | | | | | On macOS, if pkg-config is not used, we modify CMAKE_SYSTEM_FRAMEWORK_PATH and CMAKE_SYSTEM_PREFIX_PATH. This must be done in the configure tests too. Otherwise the find_package commands may return different things for configure tests and the Qt build itself. In this case, assimp was picked up from brew in the configure test but not in the Qt build. Task-number: QTBUG-97076 Change-Id: Ib43ceebe78768267a60142c5a4235eab7ac18c81 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-10-061-3/+3
| | | | | Change-Id: Ie6b36bd78e18e5e4aea597b2176cf0fa6a87ac6c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-10-051-3/+3
| | | | | Change-Id: I44c03d5dd5d6ed9bdc6af8176e6c093715c023b5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-10-011-3/+3
| | | | | Change-Id: I67da144561953a5c93d6c93f72da458cc4b396f6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Reset ClipAnimator loop counter on cleanupMauro Persano2021-09-291-0/+1
| | | | | | | | | Otherwise, if a backend node with a loop counter larger than 1 is reused for a non-looping animation, the animation won't get played. Pick-to: 6.2 Change-Id: I5b043b9c844bba9b04edc5db383bdf0e3b92fe87 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-09-291-3/+3
| | | | | Change-Id: I6b27f739ff4e3d55d694f95ae961fc76c8f22186 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-09-271-3/+3
| | | | | Change-Id: I3b494d0207296199355bb8e98450777c2e960343 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-09-231-3/+3
| | | | | Change-Id: Ia53fe88c09078ade08dc30c45045643e1f28eeb2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Bump almost all cmake_minimum_required calls to 3.16Alexandru Croitor2021-09-224-4/+4
| | | | | | | | | | | | | Needed for subsequent change that will check and error out if the version is lower than 3.16. We do that to ensure all policies introduced by CMake up to version 3.16 have their behavior set to NEW. Pick-to: 6.2 Task-number: QTBUG-95018 Change-Id: I29beb4b263c915d3ff5312a3b1ceb45e8fdc34e0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-09-211-3/+3
| | | | | Change-Id: Icb8ffa3b1d663cb2d8efedc5bb3a7e04f2b27e9d 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-26 03:48:10 +0000