summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2' in qt/qt3dv6.2.0-beta4Qt Submodule Update Bot2021-09-021-3/+3
| | | | | Change-Id: Ieadc9f29dd2a6b1ffe42d7e4807699bd56209363 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-09-011-3/+3
| | | | | Change-Id: Ia225a273d7f658879628e2ce664401dcbea5eee4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-09-011-3/+3
| | | | | Change-Id: Ib03065556f13bcce69a1a61d47e8401f792ecff5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-08-311-3/+3
| | | | | Change-Id: I0c407a79613fdb7eb6e045b4c76275e9717ee2d2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-08-301-3/+3
| | | | | Change-Id: Ie0a28d58d4541b6e677f6a630174243346b429e9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Conan: Inherit recipe class from QtLeafModule for common functionalityIikka Eklund2021-08-262-103/+42
| | | | | | | | | | | | | | | | | | | The recipe uses Conan's supported way to inherit from a given base class via 'python_requires_extend'. The qt-conan-common package implements a base class for Qt leaf module recipes. The build steps in leaf modules are mostly identical so it makes sense to put those in the base class. Dependencies are read by the base class from the 'dependencies.yaml' which is the same file the CI system uses. Task-number: QTBUG-94758 Change-Id: I61baf3f96a027ee374af6b16ba370fb85a2e698c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 91974f11f12091d94d5c5f85a3368aa1844ee580) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-08-251-3/+3
| | | | | Change-Id: I3717667653caff4cea9dbc23199fe82b8dcea630 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Ensure standalone tests are builtAlexandru Croitor2021-08-236-10/+24
| | | | | | | | | | | | | | | | | | When Qt's CI configures standalone tests with qt-internal-configure-tests the value of QT_FEATURE_qt3d_extra is not available before actually calling qt_build_tests. Move the check into each test subdirectory. Although it's likely the check was too coarse-grained in the first place and should be changed into something more specific that doesn't exclude tests that shouldn't be excluded. Change-Id: Ic267b3a9c7f078c60699b709591a3d0ae8bb3018 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 55d390ac0df48721b1ec974b37eb862faff80170) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-08-211-3/+3
| | | | | Change-Id: Ibbc8df1e8cf61c9f73e9aab856c90b11c9fc78e5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-08-201-3/+3
| | | | | Change-Id: I089b15e4df6db1437619d62fe784996e7fd319aa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-08-191-3/+3
| | | | | Change-Id: I60efd32e3586a270aa20a8674bde9409fe12ed4b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-08-181-3/+3
| | | | | Change-Id: Iec52c3ee0d734c9cbaa85c6642d43f95c4cdf59a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-08-171-3/+3
| | | | | Change-Id: Ic63bbd410d7a86758ca688098483a70959551cd9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Raise cmake_minimum_required to VERSION 3.16 in examplesJoerg Bornemann2021-08-1725-25/+25
| | | | | | | | Task-number: QTBUG-95636 Change-Id: I2ae5ba6164cb5ed450c8924d484d30167461c10d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 2372efc5d1f754116f6088099e7ac90b2317974c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-08-171-3/+3
| | | | | Change-Id: Icf2eb38380eaa29850f0f980196e122979018aa2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-08-161-3/+3
| | | | | Change-Id: I0b77d424d6715a55230530830d6b5305c226603f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dv6.2.0-beta3Daniel Smith2021-08-121-3/+3
| | | | | Change-Id: I7e2ad0344e24289f3be4a52995388a4bd587918c Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-08-111-1/+1
| | | | | Change-Id: I35b227ea5c551727b7e0dedeca52d9b2c59a67cd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Use renamed qt6_add_plugin PLUGIN_TYPE optionAlexandru Croitor2021-08-109-9/+9
| | | | | | | | Task-number: QTBUG-95170 Change-Id: I0dbbca4cd7f50af9b4aa192a05514f28b6f9658b Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit bd7bdb9e77c6f70ba421def5a00b87c073ffae07) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-08-101-3/+3
| | | | | Change-Id: I85d114d0190b474005021cf198e290f4a266acce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Replace QT_BEGIN_LICENSE:LGPL3 headerKai Köhne2021-08-10228-2315/+2931
| | | | | | | | | | | Replace outdated LGPL3 with LGPL header in src, and GPL3-EXCEPT in tests. Task-number: QTBUG-90321 Change-Id: I3f6491cb402a993a4341a983c780337e8658c256 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit cd9de7b9b5d870d5a52d59b58878564308ecb10d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Picking: reuse LayerFilterJob to perform layer filteringPaul Lemire2021-08-0912-98/+617
| | | | | | | | | | | This fixes picking for cases where multiple LayerFilters using different filter modes are present in the FrameGraph. This also reduces code duplication. Change-Id: I19d0c2c5777930820ab950cbf2bfe08ef7d2484f Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 406ea4134444a05dd89f215b3144181c0b0ce924) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Don't give plugins PUBLIC usage requirements part 2Li Xinwei2021-08-067-10/+10
| | | | | | | | | | Amends ffccff03f347b971395cb212889921506d4a36f3 Task-number: QTBUG-90819 Change-Id: Ic2cad9e60ecc73cf192fe5aadf770656fd9ed318 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 38338f5b89a6d75cb6056937a96dedbd6ea15a49) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Temporarily disable some benchmarks which fail to build on MacPaul Lemire2021-08-051-1/+2
| | | | | | | Change-Id: I1e4ecb5064a0118e295df9d2a256eb60b569ea5e Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit f52098f08a3c14e5dfa366a7955aeafa93a1dc3f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QRenderAspect: look for opengl renderer by defaultPaul Lemire2021-08-051-1/+1
| | | | | | | | | | | | Since rhi render plugin is not built by default, ensure we look for the OpenGL backend if QT3D_RENDERER is not set. Tests might fail otherwise. Change-Id: I3bc268df9e29fb8fa28d0f424e56535db7bc9c57 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit d3104c6bfc6cb3dc30d631e5b1bf6fd9ba23b1e9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix incorrect dependency on private modulesAlexandru Croitor2021-08-058-19/+35
| | | | | | | | | | | | Public modules shouldn't propagate private modules as usage requirements. Fixes: QTBUG-93428 Change-Id: Ic7aca0e8a6469604722596782e87d92d7e510e9e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 018d77678641c452a00b321527794027e4e5d92b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-08-041-3/+3
| | | | | Change-Id: I0e81c0e7f5c8d99bf6381af7509244cebdd7b81c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-08-031-1/+1
| | | | | Change-Id: I6150f7c3108980d0e8a10a966ba7134dd1dad077 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CameraLens: use ParametersDirty rather than AllDirtyPaul Lemire2021-08-021-2/+2
| | | | | | | | | | | | | | AllDirty would force a lot of recomputations that aren't needed. When the CameraLens changes the only things we need to do are: - update projection matrix in the shader and the frustum culling Those things are performed in the RenderCommand update stage which is triggered with ParametersDirty Change-Id: I27241f3ec323182b19fca7e5528d851680eeec8c Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit ca43cd97277132341676d10a515419a5390c9292) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix tests that have to run with opengl backendPaul Lemire2021-07-292-0/+10
| | | | | | | Change-Id: Ia7e3b84667d78f45195702fc131f0d3d88d1c7e7 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit c154dc6d74b55a003fe620abf3a11a592e88462f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix for QShaderNode fix that selected highest version number of a rulePaul Lemire2021-07-292-3/+4
| | | | | | | | | | | | The rule selection still has to be made from last added rule to first so that format.support works correctly. - Update QShaderNode unit tests Change-Id: I47af898ee0d82e91009efccf1dca9937feaca717 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 21168905a7eda8806543b490a0fae5a5a0ec7cad) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix tst_aspect following rerun of BV jobs when entity enabled changedPaul Lemire2021-07-291-0/+4
| | | | | | | Change-Id: I067f5861767a7d2cdf078d9a1c04e8721e5f7008 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit dfed3541b736d52ed3693835be4b2ce86fbc1d52) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix BV tests following changes in BV propagationPaul Lemire2021-07-293-18/+27
| | | | | | | Change-Id: Ifa53378c930b071231dab3d293e8bb1ed4c71b46 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit dc695bf1485fb1620fb258d57d87916b94d7c95a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-07-291-3/+3
| | | | | Change-Id: I6cfc21138e832a6aee15e4442ac1be296a8c2ec1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-07-281-3/+3
| | | | | Change-Id: Ia2dc12f3dbbbc80d1b971a79607ed5792e59a076 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dv6.2.0-beta2Qt Submodule Update Bot2021-07-241-3/+3
| | | | | Change-Id: I2ddad05f26f9d41b3b6dff6f8fc69d38789970e3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-07-241-3/+3
| | | | | Change-Id: Ie9633017e3bb4178c9a88b9dfe664e707565fda8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-07-241-3/+3
| | | | | Change-Id: I1515aa0f5f21c2f8565955db89d478e7f8f0ebb1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-07-231-3/+3
| | | | | Change-Id: I16e20ae2f6955d4264211f23432de013a55fdb25 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-07-221-3/+3
| | | | | Change-Id: I030324d6a4249648cd06880103701b6a15a4f653 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Don't give plugins PUBLIC usage requirementsLi Xinwei2021-07-229-9/+9
| | | | | | | | | | | Plugins are not intended to be linked to. They should not have any public properties. Task-number: QTBUG-90819 Change-Id: I2cc166c2b406ea0f416cbb117cbf8181cd173e8d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit ffccff03f347b971395cb212889921506d4a36f3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-07-221-3/+3
| | | | | Change-Id: If83fdbc272c6bf32970c4ad095225d93715f7a29 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-07-211-3/+3
| | | | | Change-Id: Iad60d00c2ef4f49b772d25e11f2d9ce6fa81cc9e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-07-201-3/+3
| | | | | Change-Id: I39ec14844bf49ecac1a32d0c7a4e8e62cefd3928 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-07-201-3/+3
| | | | | Change-Id: Ib2c21120017a88a3796e14eed1147aae7ec4c447 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Disable RHI Renderer by defaultMike Krus2021-07-1918-7/+71
| | | | | | | | | | | | | | | | | | | | | RHI renderer use ShaderTools which is GPL licensed. This patch disables the plugin by default until Qt3D provides a suitable replacement for the dependency. To enable the RHI backend, compile Qt3D and pass parameter -DFEATURE_qt3d_rhi_renderer=ON to cmake. Unfortunate side effect of RHI backend being disabled is that when using Scene3D, the QtQuick renderer must be configured to use the opengl backend. [ChangeLog] RHI Backend is not longer built by default Task-number: QTBUG-94960 Change-Id: I0bff7523e159b800734b58bfef37e5088d0a0d41 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 3964b273459c2999f33d51b96afe6fb68f07d52f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-07-191-3/+3
| | | | | Change-Id: I90e259b71de252210f896901d67a52b3f9e7159b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Compile RHI shaders on iOSMike Krus2021-07-191-1/+1
| | | | | | | | | | Make sure Metal shaders get generated on iOS as well as macOS. Task-number: QTBUG-95130 Change-Id: I38276405bfa58fcac1f09b9928fe5b4aa7cabe58 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 7f1f3c358258331f86dc792c653482c82bbf2ec6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-07-161-3/+3
| | | | | Change-Id: Iad14043bf56127256567c5ca4bc5d3a5c57a66fd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qt3dQt Submodule Update Bot2021-07-151-3/+3
| | | | | Change-Id: I55b829a8b5e1e0f36b9f29358d1177e387e068cc 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-05 14:04:06 +0000