summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.1.0' in qt/qt3dv6.1.0Qt Submodule Update Bot2021-05-041-1/+1
| | | | | Change-Id: Ibe06cfbee51fa193ba7d5429df1786fd2a6c3f7c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1.0' in qt/qt3dQt Submodule Update Bot2021-05-031-3/+3
| | | | | Change-Id: I64fd05832b0a067e1e7b2ee57aff500bb3287447 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1.0' in qt/qt3dv6.1.0-rc2Qt Submodule Update Bot2021-04-271-3/+3
| | | | | Change-Id: I0d0e5d9e01b95f6f33359a409fb4a7dd51e76219 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1.0' in qt/qt3dQt Submodule Update Bot2021-04-231-3/+3
| | | | | Change-Id: I4e0577af5ccf6f2c68a51e4868c585b5f519d25c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1.0' in qt/qt3dv6.1.0-rc1Qt Submodule Update Bot2021-04-201-3/+3
| | | | | Change-Id: I25065c5ee52164ce46574315d9377fc1ddebf031 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1.0' in qt/qt3dQt Submodule Update Bot2021-04-201-3/+3
| | | | | Change-Id: I3fe8293b2f66d1bf362128b09cac70b2fbd5f16d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1.0' in qt/qt3dQt Submodule Update Bot2021-04-151-3/+3
| | | | | Change-Id: I4a35da807382ff33ca3243b1275831c31541ffde Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1.0' in qt/qt3dQt Submodule Update Bot2021-04-141-1/+1
| | | | | Change-Id: Ib34496e754952b517d767757b9f9a2ed271e0a06 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove Audio Visualizer Example from highlighted examplesJani Heikkinen2021-04-121-1/+0
| | | | | | | | It depends on qtmultimedia which isn't avalable in Qt 6 yet Pick-to: 6.1 dev Change-Id: I8b525bdf0a6c78d7b4b227fa679a4e94e4883395 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-091-3/+3
| | | | | Change-Id: I4c9a283d392c8e02ff0dccd05d873cf89bc6e5f6 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-091-3/+3
| | | | | Change-Id: Idd51aaa51b4bcb760d0305628e46a068c3698dc4 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-081-3/+3
| | | | | Change-Id: Iad76ffd87619404bbc49bcd1aa228733687cd781 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-071-3/+3
| | | | | Change-Id: I4a39fd93b74a571176f785cc53af3ed6b750fbfe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Transform Qt3D.Core to declarative type registrationUlf Hermann2021-04-0616-47/+234
| | | | | | | | | | | | | | | | | We already did this for the value types. As we cannot mix declarative and procedural registration, we need to do it for the object types, too. For declarative registration, the qmltypes files are generated at compile time. For procedural registration, you need to manually invoke qmlplugindump to generate them. Doing both leads to two conflicting qmltypes files for the same module. Fixes: QTBUG-92259 Change-Id: Ic3d9c63410f84e04cd368ddaee3a6ff2d9a3c997 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 59fc9cacce5eca68c9dece3c30d6f11ee7693d4e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove useless metatype declarationv6.1.0-beta3Ulf Hermann2021-04-021-2/+0
| | | | | | | | | | | The type in question has a Q_GADGET. It shouldn't need an explicit metatype and the manual metatype declaration conflicts with the automatically generated one. Change-Id: I2a2cfafcb53f4bfbf3962ba15bc18f0f2d20a118 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 9bf40d1bed80017be065c5e9e8873b11638ac34b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-011-3/+3
| | | | | Change-Id: I8f2fa00b4a724b4cb59324d39f470b8b13fb65d6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove quick3d plugins.qmltypes to unblock integrationsAlexandru Croitor2021-04-011-573/+0
| | | | | | | | | | | | | | | | | | | The build system ended up trying to copy two different versions of plugins.qmltypes, one auto-generated by 3DQuick Qt module and another that was manually generated by qmlplugindump. Since c42d558dc9ff89d452546412ee88a16ae1e324e4 landed, this uncovered the issue and made it a fatal error. To unblock integrations in Coin, temporarily remove the manually generated file to avoid the duplicate copying. This means that qmltypes support is lost for some types. Pick-to: dev Fixes: QTBUG-92254 Task-number: QTBUG-92259 Change-Id: I23587d6581421cb0339e82950b3604ba39dad748 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-04-011-3/+3
| | | | | Change-Id: I886736df68da79004015016478691d74b945426a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-03-311-3/+3
| | | | | Change-Id: I4ef8b29d6fdfb9d76b6291a2c0f782a90e83aa4a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-03-291-5/+5
| | | | | Change-Id: Ic1fde6fe019fe473279c940ec7fb7e3cc8c2d69e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Restore ObjectLevelLockingPolicy on ShaderManagerPaul Lemire2021-03-221-1/+1
| | | | | | | | | | | | We are hitting a race condition otherwise. This is likely due to the fact that removing the shaders is done only once we have unloaded them from the graphics API which technically could happen in a separate thread than the scenegraph thread when running with Scene3D. Change-Id: Ic914f3b305bf807081294a90250413a5d263f124 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit a536039d102f911677e5efec03cc6f3d701aceac) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Drop documentation buildJani Heikkinen2021-03-192-6/+0
| | | | | | | | | | | | | | We will add additional libraries back to the qt5.git. Having documentation build enabled in additional library will cause problems in qt5.git integrations so we need to drop it from module builds. At same time drop the qttools dependency which were added for documentation build Task-number: QTBUG-91796 Pick-to: dev Change-Id: I260d20caf2367f97ab3fca00266dd9d5bc4cf447 Reviewed-by: Toni Saario <toni.saario@qt.io>
* Update qtquick3d-assimpJani Heikkinen2021-03-167-659/+415
| | | | | | | | | Use same version than qtquick3d is using Change-Id: Idff7881dd1ce4608915c6f3e653cf9d16f731374 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 842542e01062714eae32bea7e89a5c630c6e14b4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add "scm" attribute to conanfile.pyIikka Eklund2021-03-151-0/+1
| | | | | | | | | | | | | | We want to match the commit ID along with the RREV (recipe revision). This way we can pin exact Conan packages to known sha1/tag which makes releasing easier. https://docs.conan.io/en/latest/reference/conanfile/attributes.html#revision-mode Task-number: QTQAINFRA-4325 Change-Id: I33095ecd14ce711516d5a13d70ffabf444c67392 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 4d60c670ab2155332bfca799e1f5205273c0bc8e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dv6.1.0-beta2Jani Heikkinen2021-03-151-4/+4
| | | | | Change-Id: Iee4ee0cc19679d5ec51ef4aa02b73aef030687f3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.1' in qt/qt3dJani Heikkinen2021-03-051-4/+4
| | | | | Change-Id: Ia9d4dac60898fd264ecd32b07ca2546c30d1c8e3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.1' in qt/qt3dJani Heikkinen2021-03-031-4/+4
| | | | | Change-Id: I4e6dc1c9695d4d5e7a4139f94aab62c150954a42 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* ObjectPicker: ensure pristine pickers are handledNicolas Guichard2021-02-262-0/+20
| | | | | | | | | | | | | | When adding a QObjectPicker component to a QEntity, the object couldn't actually be picked until one of hoverEnabled, dragEnabled or priority changed. This fixes the issue by ensuring notifyJob is called at least once, when the picker is initialized. Change-Id: I5b035cf5be6ef1da35c2d24cf76bc2daaad9bc57 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 1641eae01636ddb82b668c4f91d2c26f89e5bc06) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dv6.1.0-beta1Jani Heikkinen2021-02-231-4/+4
| | | | | Change-Id: I04283c7acd4fb978e18b036640a700f1db689599 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.1' in qt/qt3dJani Heikkinen2021-02-221-2/+2
| | | | | Change-Id: I4792edb0c48677872ec7a25b061081e7dbdb8a2f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.1' in qt/qt3dJani Heikkinen2021-02-221-4/+4
| | | | | Change-Id: Ib0fb2c6ff47cbeca45c63155349d81459d26ded4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.1' in qt/qt3dv6.1.0-alpha1Jani Heikkinen2021-02-121-4/+4
| | | | | Change-Id: Ifa3eeffa9b3b8e6fb2988c8b798e80740a986eea Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.1' in qt/qt3dJani Heikkinen2021-02-101-4/+4
| | | | | Change-Id: Id09312ec8591aee4797cc5fb46d686b6ac0935a9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.1' in qt/qt3dJani Heikkinen2021-02-091-4/+4
| | | | | Change-Id: Ie9c5ff5d3167c6c6d3fc57c6dc8e7b02c57d5b95 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Conan: Use the 'shared' option value of the Qt buildIikka Eklund2021-02-081-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to the value of the prebuilt Qt build. The 'default' needs to be added as valid option in the list which will be used by default if no value is given by the user or via the conan profile. The user is still able to override this via the profile or from command line if needed: "conan install ... -o shared=False" CMakeCache.txt: - "conan install ..." - BUILD_SHARED_LIBS:BOOL=ON - "conan install ... -o shared=True" - BUILD_SHARED_LIBS:BOOL=ON - "conan install ... -o shared=False" - BUILD_SHARED_LIBS:BOOL=OFF Task-number: QTBUG-90901 Change-Id: Ifd9ef0d982a1f1e4a3f454e3d5e4c7075f873c22 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit b2d0ef3f7ab36b93a51eb0bea14afe1e9fc5c0d1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Minor fixes to compile against 5.15Paul Lemire2021-02-0116-14/+74
| | | | | Change-Id: Id9574cf23b9af29815d8452915cebfc380fd94d1 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* conanfile.py: Use QTDIR instead of QT_PATHIikka Eklund2021-02-011-4/+4
| | | | | | | | | | | | | There's an established environment variable for this though, QTDIR. This environment variable is also set by Qt Creator by default. So the Conan recipes should accept this environment variable instead. This requires a change in the matching conan profile files where the path to Qt installation is injected to env. Task-number: QTBUG-90583 Change-Id: I0beaff832325008dd1778a03d2885b6190def754 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix MSVC warning about inconsistent DLL linkage of QAnimationClipData ↵Friedemann Kleint2021-01-291-4/+4
| | | | | | | | operator==/!= Pick-to: 6.0 Change-Id: I8e63400ca2b2d6d7963b8ea6f111e6e9026f1278 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix a number of MSVC int conversion warningsFriedemann Kleint2021-01-2922-56/+56
| | | | | | | | | | - Port the qHash() functions to size_t - Add some casts - Adapt some types Pick-to: 6.0 Change-Id: Ib889d46dd56c1a1c4bf6b87ae1f756c188069180 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update dependencies on 'dev' in qt/qt3dJani Heikkinen2021-01-281-4/+4
| | | | | Change-Id: Ieff0d005bd6bb3703b382e06a5976da7b47dc6b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Make Qt3DWindow handle default surface format more gracefullyMike Krus2021-01-272-10/+26
| | | | | | | | | | | | | | | | | | The default is now to use the same rules as QtQuick. If nothing is specified, will use RHI and the best surface for the platform (Metal on Mac, DX on Windows, Vulkan if available, etc). If Qt3D's OpenGL backend is requested via QT3D_RENDERER, will always use OpenGL surface. If QSG_RHI_BACKEND is set, will honour that if possible. Otherwise will use the API requested in the constructor (which defaults to using auto detection). Pick-to: 6.0 Change-Id: I8941a081940c073dfcf66711a8628e8ef6fd0915 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix light uniforms not properly being updatedPaul Lemire2021-01-272-1/+8
| | | | | | | | | | | | | | | | | | - We cache commands and only rebuild them when really needed. When we rebuild then, we also store the mapping between uniform location and parameter name - When reusing a command, we only update the uniform values but expect the mapping between to remain the same. - When dealing with lights however, we can end up in a case where the light type changes, and therefore so does the shader data associated. The command remains cached as nothing really requires a rebuid. Yet, this means we could have more or less parameters than the number of mappings we have stored previously if the shader data defines more or less properties. To account for this, we now rebuild the mapping when building the command or if the number of parameters in the parameter pack is different than at the previous frame. Change-Id: I9400fc7e5bcb4b97ac9da69cdf794010cf81103b Pick-to: 6.0 5.15 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Only declare staticVulkanInstance if QT_CONFIG(vulkan)Paul Lemire2021-01-271-0/+5
| | | | | | | | | Should hopefully fix compile issues on platform when vulkan isn't found. Change-Id: Ia54486dc160960e0e7000c7de832f154ecee8b0c Task-number: QTBUG-90243 Pick-to: 6.0 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update qt/qtquick3d-assimp submoduleJani Heikkinen2021-01-182-0/+1
| | | | | | | | Fixes: QTBUG-89433 Change-Id: Iec372c94b541f871f3ed78843656c2dfa1a1f613 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> (cherry picked from commit 5d4a3edca84eab4453165f7d90d786a2b914f58e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix parameter priorization documentationAntti Määttä2021-01-185-21/+30
| | | | | | | | Pick-to: 5.15 Fixes: QTBUG-64110 Change-Id: I09330ba29b0c120d6e7e0ae0b2bf8d4e388054e1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Don't hardcode version number in CMakeLists.txtLi Xinwei2021-01-131-1/+2
| | | | | | | | | The version number should depend on .cmake.conf. Pick-to: 6.0 Change-Id: I1ef7713d7dbf3ee5f0abdf7f9d8ff0fb89cdb6dc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Bump versionPaul Wicking2021-01-132-2/+2
| | | | | | | | | CMake edition. Task-number: QTQAINFRA-4126 Change-Id: I70eabc0c855ccbbe4edf01a0cf8ad50d2ff472fb Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Bump Qt version to 6.1.0 in conanfile.pyJani Heikkinen2021-01-131-2/+2
| | | | | | Change-Id: I7cafcda260fc1bda271135a2cd20472efc5e1b1f Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update dependencies on 'dev' in qt/qt3dJani Heikkinen2021-01-121-4/+4
| | | | | Change-Id: Ib6150bb7344b23083b5c0acf6163134034a10e30 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Clean up use to QVector vs QListMike Krus2021-01-111-7/+7
| | | | | Change-Id: I797f52d7cf4f55b5991448c0498e0b149a3dd7c6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 08:47:13 +0000