summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.1' in qt/qt3d6.1Qt Submodule Update Bot2021-10-011-1/+1
| | | | | Change-Id: I4db58a0697c422ac24cdb40b0f4a293c81da66e6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-09-291-1/+1
| | | | | Change-Id: I5a094a30f1359c4c0a1576c87080156e2f606064 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-09-281-3/+3
| | | | | Change-Id: I50c882830bd01dd24263620200578e296117d75b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-09-231-3/+3
| | | | | Change-Id: I81a84dfec28d7eea4ea126836b85f6b99724eb69 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-09-141-3/+3
| | | | | Change-Id: I122d52457bf70be7eeceb3c68d2081fb419c0ca5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-09-031-3/+3
| | | | | Change-Id: I715549fdfd8e448cca54a5e981de39d86023c369 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-09-031-3/+3
| | | | | Change-Id: Ifb35d27a65a63b08bce1149082635b0a88fae4b8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-08-311-3/+3
| | | | | Change-Id: I92dc9317b247d3564ccd2b57ed31eaa5b35a2fde Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-08-301-3/+3
| | | | | Change-Id: Id9cd01ba90c99f6227c8a1e29420ad45e0e498c5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-08-201-3/+3
| | | | | Change-Id: Ic70d24c4c1b0437a8592cf2b81bd660e03e44f91 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-08-181-3/+3
| | | | | Change-Id: Iba393d6c9d40469fd1a443de17003a2b2d587ce7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-08-141-3/+3
| | | | | Change-Id: I22e1c81a06198dddcf72ef2ca00d0a9fad19d5eb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-08-131-3/+3
| | | | | Change-Id: I8ca5caa07b4c0f07bb86c6bceea07855b77e7dbc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-08-131-3/+3
| | | | | Change-Id: I62af36171ed4121d955e1696112152d13ac611f4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-08-131-1/+1
| | | | | Change-Id: Ib042f15f886a85fcc5ca5421d3ed04dbede08ef3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-08-121-3/+3
| | | | | Change-Id: Ibda19a0c7502120db9b273c465eae7653d3b9369 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-08-091-3/+3
| | | | | Change-Id: Ia31bed24ce3e059f9e5ab9e76e3becbad86f6508 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-08-091-1/+1
| | | | | Change-Id: I10f18b253e9ee2ae5f340d07c22cdd91012b3017 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-08-061-3/+3
| | | | | Change-Id: I5ea5c7dbd7a55ae6e74996d79e197c95f297b197 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_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>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-08-031-3/+3
| | | | | Change-Id: I164aeb9d6af511d1f624beb5edadfccb689ac934 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-08-021-3/+3
| | | | | Change-Id: I471ae68a2765ce08b274b38e3b2742cec93e4ac3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump versionJani Heikkinen2021-08-023-3/+3
| | | | Change-Id: I5ef26d617e3885a4d685bf1e78291541af4c92db
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-301-3/+3
| | | | | Change-Id: Ia28adccdb547a1aab38ac076831772d77655cb1f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-301-3/+3
| | | | | Change-Id: I2a8735aa454d005dde7b0caa7ef6334bac57ac6a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_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.1' in qt/qt3dQt Submodule Update Bot2021-07-231-3/+3
| | | | | Change-Id: I09346173d3e4110b49b0d9e739e952569ab0c8c7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-221-3/+3
| | | | | Change-Id: I0e17f519b3c5ca347e47e0c39bcd93b9095d4c83 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-221-3/+3
| | | | | Change-Id: Icc88b2f9f9e700c59b1cbedd9c52d5331c7cf385 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-221-1/+1
| | | | | Change-Id: Id30ad60a9cd0ff55f6924676d068dec0a75e3bf3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-211-3/+3
| | | | | Change-Id: I4b21cecd25ae3b967903594c91d34a6fcd848dce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-211-3/+3
| | | | | Change-Id: I81ac05797f3c13685f652a26bea24c15c0b10cf8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-201-3/+3
| | | | | Change-Id: Ic0806af787c6f09d5b65cfa9f7d58481659e80fc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-201-3/+3
| | | | | Change-Id: I7d9a8d99c594c17d57164a944d9abc6103710cdc 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.1' in qt/qt3dQt Submodule Update Bot2021-07-161-3/+3
| | | | | Change-Id: I8b1ac53947f2ef2cacfdc8b695f4daac104166bd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-151-3/+3
| | | | | Change-Id: I61729ebdd0ff7d19cc13abf2a2dd7513cac9d0ff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-151-3/+3
| | | | | Change-Id: If078a31b52ebbea109d84d1efd1337aafe458bf1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-151-1/+1
| | | | | Change-Id: If37de6ae2c2a0311b0966dd4479d12300653f3cc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-141-3/+3
| | | | | Change-Id: I3da748f185f2f89aee4f33eb5dff955ca2d2b79d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-121-3/+3
| | | | | Change-Id: If562c3eb34fea249a23b6d81b977f7137ccc437c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QCoreAspect: run the bounding volume job when Entity enabled changesPaul Lemire2021-07-091-1/+2
| | | | | | | | Task-number: QTBUG-93035 Change-Id: I7157783e195b274001e81662e7e3929c32fbc8a1 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit d1a6046de5718ba17cef28857dd2674de62adab3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Rerun bounding volume update jobs when entity enabled property changesPaul Lemire2021-07-091-3/+6
| | | | | | | | | | | | | Otherwise, this results in the bounding volume being out of sync with entities (an entity initially disabled that gets enabled would have an empty bounding volume) until some other events in the scene triggers a rebuild. Task-number: QTBUG-93035 Change-Id: Ia21eec0eb5601169e1789321080803a5aed12e82 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit d29f3b277d0f949f2fa0b0e0214e38ec3e790c40) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-081-1/+1
| | | | | Change-Id: I2d145d5cdff707a5944654f467b25af75b92ddee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-051-1/+1
| | | | | Change-Id: I23302050f619f6b01bf881c4a0f97be20deb3a80 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-07-011-3/+3
| | | | | Change-Id: I156b2110fdeeed5a8c1070684d82c1e20fc376c9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>