summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2.0' in qt/qt3d6.2.0Qt Submodule Update Bot2021-10-041-3/+3
| | | | | Change-Id: I99c60ef6394892cde18c8f31cf3c2d6894289985 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qt3dQt Submodule Update Bot2021-10-041-1/+1
| | | | | Change-Id: I0e526a390336153236b2e9542420be138ebb1237 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENTIikka Eklund2021-10-031-1/+1
| | | | | | | | Current value should be empty to reflect the branch status. Pick-to: 6.2 Change-Id: Ib5f5ed2e059430a2883f64aea894cfca649c33a2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.2.0' in qt/qt3dv6.2.0Qt Submodule Update Bot2021-09-251-3/+3
| | | | | Change-Id: I6d21d9f0866855f2b9fcc281e100d8640fcc8168 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qt3dQt Submodule Update Bot2021-09-221-3/+3
| | | | | Change-Id: If8597bb57ccb833080c809d2b384f56c926edb4a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qt3dv6.2.0-rc2Qt Submodule Update Bot2021-09-211-3/+3
| | | | | Change-Id: I7c1b58feac16b8d139306c5511a2f674bb6f0618 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qt3dQt Submodule Update Bot2021-09-191-3/+3
| | | | | Change-Id: I91269ff2731df7177900da4f251876d7e96f83a6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qt3dv6.2.0-rc1Qt Submodule Update Bot2021-09-141-3/+3
| | | | | Change-Id: I484539401100f454eac42552eebdd97eead2be89 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qt3dQt Submodule Update Bot2021-09-111-3/+3
| | | | | Change-Id: Ica8f750c3f850d95a8c12d7d87c982f0656cc390 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qt3dQt Submodule Update Bot2021-09-111-3/+3
| | | | | Change-Id: Id088ba3b7eed033fe22e6a1152449f215dd0d321 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qt3dQt Submodule Update Bot2021-09-101-3/+3
| | | | | Change-Id: I952453a080dc27ffbefd073f3e59eb51b82bfea0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qt3dQt Submodule Update Bot2021-09-101-3/+3
| | | | | Change-Id: I1f8ffd38d0014b4deb6272b60b226041035c6b27 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-081-3/+3
| | | | | Change-Id: I8f770ad2693fde4e3318be489f2a01ac2ea47ca0 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-071-1/+1
| | | | | Change-Id: I3d0eef53590f39c2f898d71e7edc7809b1bd4bf2 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-071-3/+3
| | | | | Change-Id: Ibdb5c1790dbdc11dfe873c4395b5b663a4029397 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-061-3/+3
| | | | | Change-Id: Ibcb99333eb46656237734a6b64ed893b5dbdfb1c 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-061-1/+1
| | | | | Change-Id: Ib02cf43dd2d487e550320bff6aa6c8651b7dd79e 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-041-3/+3
| | | | | Change-Id: If0452606cee0d47ea686761e38a5588481b13d2d 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-041-3/+3
| | | | | Change-Id: I52c243d80326650564c351da73df30b4aff1b67a 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-041-3/+3
| | | | | Change-Id: Iee92311a5ccf8f219b8af46e469b783c89673e16 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-031-3/+3
| | | | | Change-Id: Iace75070527c3f610af755e689eebbd3e34c5d20 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-031-3/+3
| | | | | Change-Id: I3be17edab0e2e46ac21e8313cfe5dba920f52554 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-021-1/+1
| | | | | Change-Id: I4c4497174d2f98237639d58135cb5f5a6a08e4b5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 00:20:36 +0000