summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.1.1' in qt/qt3dv6.1.16.1.1Qt Submodule Update Bot2021-06-021-3/+3
| | | | | Change-Id: I3e8afe5885a2462697db6aa43e36009c6b4e3e0e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1.1' in qt/qt3dQt Submodule Update Bot2021-05-281-3/+3
| | | | | Change-Id: I9967bc2e3f58cceac45de95b8ad0171d1ae1498c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-241-3/+3
| | | | | Change-Id: Id7f4991a9a1cdf30068c477efaa3e0c293a160c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-211-3/+3
| | | | | Change-Id: I5b0f92347ef8a3f31d19052e7d9e26204895b21b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-201-3/+3
| | | | | Change-Id: Ieec1292384c01e83162c60c024e75164d32eaf40 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-191-3/+3
| | | | | Change-Id: I66618935dd5f8202c6ea67a69985a225457c217a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-181-3/+3
| | | | | Change-Id: I4cd3e8f6d38e5f69d5f9bb31ffb8c323a0103dba Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Re-generate CMake project files for examplesJoerg Bornemann2021-05-1831-0/+126
| | | | | | | Change-Id: Ic123a704f904096e112b5bdece167800dfc295bb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit b7b7285d0198c6d7e0e2f1a10a90a386e04f9e90) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-181-3/+3
| | | | | Change-Id: Iebdc36acaddfaf4053289dab94074f08c01037dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-181-3/+3
| | | | | Change-Id: I8133b6fe4d82fc8f83791c014ef9a7f9e2936876 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-131-3/+3
| | | | | Change-Id: If1e7029d87221b621a60f775dd22e5e17dda0d8b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-131-3/+3
| | | | | Change-Id: I195fbce36414bd0fb5eae9c4f9ff265586a18c20 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-121-3/+3
| | | | | Change-Id: Ia54655f34be1521abc1174d80f312b788321a32b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-121-3/+3
| | | | | Change-Id: If3c3d79dbc7e557ee07a7e0fbc57e0b7b617813c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-121-3/+3
| | | | | Change-Id: I294a65d875d71e7f1bbd69ffba9f31547f84fa8a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-111-3/+3
| | | | | Change-Id: I79addbb7a8f441709f84dafb559f1e059ca0d026 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-111-3/+3
| | | | | Change-Id: I0876410677902090fd877afb4fdd652612709fef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-111-1/+1
| | | | | Change-Id: Id06f85b68dbb2fa45a0b62ba8b226bbb37771870 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-111-3/+3
| | | | | Change-Id: I286f89b0ab93c4e73b567bb429d594105fcdd915 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump versionJani Heikkinen2021-05-073-3/+3
| | | | Change-Id: I0d67e471bd68a0c356c968282535a0b3758dc95e
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-071-3/+3
| | | | | Change-Id: If50f768f8e9a9328a8b5d403143a76c30155b97f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-061-3/+3
| | | | | Change-Id: Idfd65db4f975bbce154b632b670d11daa4c91f89 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-061-3/+3
| | | | | Change-Id: I131948065ed55e4536b6228f2238b454292b9f31 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-061-3/+3
| | | | | Change-Id: Ic99477f844d64f1034c0c03ad7a31b7288690e94 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-061-1/+1
| | | | | Change-Id: I554e290a5c5f8a5c005388e5d794754132b9e691 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-051-3/+3
| | | | | Change-Id: I2ac748690e989738deed7c42194ecab121d3c9cc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-051-3/+3
| | | | | Change-Id: I7b87aa73e04f3d3dad8966dfa9611bf9f27c342e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QShaderNode: use rule with highest version numberMauro Persano2021-05-041-5/+8
| | | | | | | | | | | | Pick the supported rule with highest version number. For instance, if we're looking for a rule for OpenGL ES 3.2, and there's a rule for ES 2.0 and another one for ES 3.0, make sure the rule for ES 3 is selected. Change-Id: Ie517206948bc0422f6254472de43cda4dd2ce982 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit e5276cd4cdc6b7b2e37c14e6983eaf4ce31b5a1c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-041-3/+3
| | | | | Change-Id: Ia2a2254a60d8486576ca97b95365d97642884ea3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix call to drawBuffers in SubmissionContextMauro Persano2021-05-031-1/+1
| | | | | | | | | | | | Implementations of GraphicsHelperInterface::drawBuffers expect an array of zero-based attachment point indexes (GL_COLOR_ATTACHMENT0 is added to the indexes internally), so we can't convert the attachment index to an OpenGL enum before calling drawBuffers. Change-Id: Ibc8af9f7c402b055c5391ad673b815c1fb65a40a Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 0157b93098fb5339cfe8fe99a111cf6e6f047565) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-011-3/+3
| | | | | Change-Id: I81e0b2dbe9df5be241d93090e4b90128b1796f86 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-301-3/+3
| | | | | Change-Id: I00a2ac3c7aac8e135deb2604a4d098d4c1d0c82e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-301-3/+3
| | | | | Change-Id: I5782aba0851f84ea18e73bd0737b6438e9399c80 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix error when configuringKai Köhne2021-04-291-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The benchmark, manual folders is already added to the build in Qt6BuildInternalsConfig (depending on whether QT_BUILD_BENCHMARKS , QT_BUILD_MANUAL_TESTS are true). Adding it manually again leads to errors like The binary directory C:/dev/qt/6.1/msvc-2019-amd64-toplevel/qt3d/tests/benchmarks is already used to build a source directory. It cannot be used to build source directory C:/dev/qt/6.1/src/qt3d/tests/benchmarks Specify a unique binary directory name. This reverts part of 8448855b8050e56 Fixes: QTBUG-93240 Pick-to: dev Change-Id: Idc5b2fea6996cd8367f0963e993dd788dd3fb239 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-291-1/+1
| | | | | Change-Id: I0248dd6a9ae7639ede96c593a95b6c30aa1c66b9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-281-3/+3
| | | | | Change-Id: Ib7392e7e4c43747b11917a10ba5d198a0f0b81d3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-281-3/+3
| | | | | Change-Id: I4dcede86cdfe10bf4dc7a1cad5f3456112b8d6c3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-271-3/+3
| | | | | Change-Id: Icb136938f092d5b5913d32ac27369c3b1f5794cd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-271-3/+3
| | | | | Change-Id: Ic85ed21de10fb6f1736cac65e5a5829abce8d2df Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-271-3/+3
| | | | | Change-Id: I499d519f320db8072daff6be326f2ea3a6f0358c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-271-3/+3
| | | | | Change-Id: I5f3bc30be46ef07327b9af24c26c41d352b2586f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-261-3/+3
| | | | | Change-Id: I9691159a38c2c34794d5931d972917544d7fb643 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-261-1/+1
| | | | | Change-Id: I05e3cdf9196a27ccd3e6f68bc9e61cfb141116dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-261-3/+3
| | | | | Change-Id: I8dad526a2b10b75755e15ba4c166592f71ba1978 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* pbr-material example: add qrc:/ prefix resource for assetsPaul Lemire2021-04-232-35/+35
| | | | | | | | | So that assets are properly picked up by Qt 6 Change-Id: I78eb79f0c4f5a2e124d57692d4af2947e743bd33 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 3dbfb4f73f0ade4d9bee5a243aa94c412b0ed73d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-231-3/+3
| | | | | Change-Id: I7834f6864a698a35047da8bdda4ef25c79841e8d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-221-3/+3
| | | | | Change-Id: Id1278cd947ecdbecd59505f5ce449fccfc1369b3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Adapt to new WrapZLIB packageAlexandru Croitor2021-04-221-3/+3
| | | | | | | Change-Id: I8d45926ebe6abadaa7f5eaa1f8cf6c34df664b9f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit e13df32309d920de813b89adcdac659f826b2aef) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-221-3/+3
| | | | | Change-Id: Ibc837ac940693611c5b1530d262b99bfa30c0c0d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-221-3/+3
| | | | | Change-Id: Ie23b36934cf7118b7f051875eb1045eb16e1bb96 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
View Lorry Controller Status