summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.3.0' in qt/qt3dv6.3.0Qt Submodule Update Bot2022-04-051-4/+4
| | | | | Change-Id: I9f4ebc4c40f1a3f6cb87aa411053332bc067da26 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix compilation of exampleMike Krus2022-04-051-1/+1
| | | | | | | Task-number: QTBUG-101595 Pick-to: 6.3 dev Change-Id: I9578d2943768c62ad57da9d19d9ca667a2dff3e9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Update dependencies on '6.3.0' in qt/qt3dv6.3.0-rc1Qt Submodule Update Bot2022-03-241-4/+4
| | | | | Change-Id: I0d98c4765d2ccf7ed61412616988227f90cf34c0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3.0' in qt/qt3dQt Submodule Update Bot2022-03-231-4/+4
| | | | | Change-Id: If3f7950156ad69f078283f12077bc9fba3116ce6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QKeyEvent: fix build with QT_TYPESAFE_FLAGSMarc Mutz2022-03-221-1/+1
| | | | | | | Change-Id: I708f94b625edf1ed7ff1073792cf49bff39c3d98 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 2532268b1028a006be34132632cc3d67142467ee) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3.0' in qt/qt3dQt Submodule Update Bot2022-03-211-4/+4
| | | | | Change-Id: Ic76490b421b9e1c3ea5ffa360864c3e9d704ff58 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2022-03-161-4/+4
| | | | | Change-Id: Ib27eaef0e055fdb2c15cf8f031a311bb26f99226 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Revise Qt3D module landing pageAndreas Eliasson2022-03-152-20/+93
| | | | | | | | | | | | | Add missing Building with Cmake section. This module landing page differs from other landing pages in that it contains information on how to use its subdirectories. Task-number: QTBUG-100369 Change-Id: I9fa2a94a11790faf94b48e64b399ffa72fc7eade Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 083199d1dc385c129b8dddd36a680729ff1640a8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2022-03-141-4/+4
| | | | | Change-Id: Ib577f2e1f2eb4aeafdff313bfc41bd614fa1d98c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dv6.3.0-beta3Qt Submodule Update Bot2022-03-111-4/+4
| | | | | Change-Id: Ifaa8c236b541e0fd17292676d3b2f975fca7a700 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2022-03-081-4/+4
| | | | | Change-Id: I72ea282343ca5c15c462364c777fa7df77bba24d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2022-03-041-4/+4
| | | | | Change-Id: I469c91eac27fcf24495ced9371d9ba7accb194c5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Avoid enabling qt3d-simd-avx2 if avx feature is disabled in qtbaseAlexey Edelev2022-02-241-0/+1
| | | | | | | | | | Make the qt3d-simd-avx2 feature dependent on the avx2 feature. Fixes: QTBUG-101176 Change-Id: Id056f383a4781dc4318b985631ebee46bb4b7961 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 3fce3beeb2d1f78020a9dbde9fc7de8d8b0bd8d7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing Network packageAlexey Edelev2022-02-241-1/+5
| | | | | | | | | | | 3DCore depends on Qt::Network, but the Network package is not mentioned as required component. In general case it looks like the package is found as the dependency of other targets. So add it explicitly. Change-Id: I26b298e5254c7d5d03ffcb24794180dbec0fd24d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 5d779c622705ed2388288b6f5e172f4e2f239d09) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2022-02-231-4/+4
| | | | | Change-Id: I6f30ff9ea43f2606a9387ee7961253000ba28d14 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2022-02-211-6/+6
| | | | | Change-Id: I39ae00e3b6329d72f94a061961a5dca7bf2c9f06 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add qtmultimedia as an optional dependencyKai Köhne2022-02-191-0/+3
| | | | | | | | | Qt 3D can use qtmultimedia, if available. Change-Id: I107c64fb6ab324f1899282620013749891dc168b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 25f4ba54ff856d9cd6f4bdc2a92e7c6d1d3b35a2)
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2022-02-161-3/+3
| | | | | Change-Id: Iacc3dc94cbc49c3bd54b140c6b5e571d9fad7b82 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Do not highlight Planets and Advanced custom material QML example anymore in ↵Zhang Hao2022-02-161-4/+0
| | | | | | | | | | | Qt Creator Fixes: QTBUG-100648 Change-Id: I6c98ea8091002a72a8ef393c0b7331fb44eb80e0 Reviewed-by: Kimmo Leppälä <kimmo.leppala@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 423ae83c2fc17b9a8634617ab0af848aa07c845a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve examples CMakeLists.txtKai Köhne2022-02-1527-418/+125
| | | | | | | | | | | | | | | | | | | - Remove # generated from xyz.pro comment from pro2cmake - Remove "# special case" markers for pro2cmake - Remove automatic use of CMAKE_AUTORCC - Only opt into CMAKE_AUTOUIC if .ui files are involved - Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR - Combine multiple find_package(Qt6 ... calls) - use REQUIRED COMPONENTS - sort components alphabetically - Fix wrong indentations - Use (only) one empty line after multi-line commands Change-Id: I42cb1788cd53082f71f6a67446dc94f502497dca Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 97c866c75f5d60a79d799279f315d744fbcc2174) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dv6.3.0-beta2Qt Submodule Update Bot2022-02-121-3/+3
| | | | | Change-Id: If93a9fbe4d5f54a45b0e25595807e784c60298c8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix crash in Renderer::cleanupShaderHarald Vistnes2022-02-101-0/+3
| | | | | | | | | | Input parameter shader was not checked for null before being dereferenced. Added check for null to avoid this. Task-number: QTBUG-100568 Change-Id: I568b97169320ea4504955467fdf12584f5320a06 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit cb0751cdd983da7b93457ff15d0e0a0c19646e0a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2022-02-091-3/+3
| | | | | Change-Id: Iacbb5554ea0086d39275cde8ef3ecb67c95ddf8f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Switch examples to build as isolated sub-builds part 2Alexandru Croitor2022-02-051-1/+1
| | | | | | | | | | | | | | | | qt_examples_build_begin needs the EXTERNAL_BUILD flag to know that it's safe to build examples as ExternalProjects. It still won't do it in CI until we enable building examples as ExternalProjects for prefix builds. This is preparation for that. Task-number: QTBUG-90820 Change-Id: I7bd1fdddfba2b87280ebe8bc0762746ade8da468 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 967130d6613ff2c11b35e7f8c5510cae5a03ad5e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix compilationMike Krus2022-02-041-1/+1
| | | | | | | | Task-number: QTBUG-99945 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit a09a74146416a9e17a9ca5dd705688b33151da83) Change-Id: I6bafcb26e976e80a0987e2f1d6950cd7cf811794 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update dependencies on '6.3' in qt/qt3dv6.3.0-beta1Qt Submodule Update Bot2022-01-311-3/+3
| | | | | Change-Id: I73780e91586a1a34639571ba4d77643434d60f02 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Use big resources in some examplesJoerg Bornemann2022-01-273-108/+6
| | | | | | | | | | | | | Update CMake project files for examples that use exampleresources/textures.qrc to use big resources. This avoids too much memory load on the compiler process. Fixes: QTBUG-100201 Change-Id: Iba933361f66ccb459f6fd1b36774748117b9655c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 30199e8ab7e05f5370fc28261c9dc72352fb0c1a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2022-01-261-3/+3
| | | | | Change-Id: Ifdac212abe5535fd5d1d30bb3b5ff32e7dac1edc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2022-01-241-3/+3
| | | | | Change-Id: If5a4be3e87df55608a3e1f4776ee2d9209e128fd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2022-01-181-3/+3
| | | | | Change-Id: Iaf935d2f4c8ce8f0ce8e7a9e2f80908a2d542e2c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2022-01-131-3/+3
| | | | | Change-Id: I4c4413469e0227923ee315f2b131bf391fbc41cf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dv6.3.0-alpha1Qt Submodule Update Bot2022-01-081-3/+3
| | | | | Change-Id: I552ca35b243a61bd5f197c169d44774fbfcd4592 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2022-01-061-3/+3
| | | | | Change-Id: I02606d8bb4c95ba7f287183fa67cce99d0b04ca5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2021-12-221-3/+3
| | | | | Change-Id: Idf5b47abed1b5fe5eec7f1eefc0f1ea7f1a12b66 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qt3dQt Submodule Update Bot2021-12-211-3/+3
| | | | | Change-Id: I6243705e965ca7b93a50326bb281179821256416 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Move Qt::Concurrent to the PUBLIC link sectionAlexey Edelev2021-12-201-1/+1
| | | | | | | | | | | | | | | | | | This is the workaround of QTBUG-86533. The Qt6::Concurrent target needs to be added to the IMPORTED_LINK_DEPENDENT_LIBRARIES_RELWITHDEBINFO property of the exported Qt::3DCore target. This doesn't happen bacause Qt6::Concurrent is INTERFACE_LIBK_LIBRARY propagted by versionless Qt::Concurrent target. Qt::3DCore links Qt::Concurrent only and due to the issue in CMake, CMake skips adding Qt6::Concurrent to the IMPORTED_LINK_DEPENDENT_LIBRARIES_RELWITHDEBINFO list. The workaround propagates the Qt::Concurrent to the Qt::3DCore consumers explixitly as the interface link library. Change-Id: I5ecbc1c9c695bd2ce6022f123ff1496cce3ff32a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit c11447185bcfd33d9edbc9508d6de066c62c3e60) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Switch examples to build as isolated sub-buildsAlexandru Croitor2021-12-151-24/+24
| | | | | | | | Task-number: QTBUG-90820 Change-Id: I975f67a1899363687092b25d936c874163c661ea Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 7611c48f0c7fbebb33ffa3741de2d6eeb0663217) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-12-121-3/+3
| | | | | Change-Id: I31804a12d8626f6ca673f4a0dd4b21112071a4e8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-12-111-3/+3
| | | | | Change-Id: I53ba0180d7d343d24adfac19e15c14b25221b418 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Don't attempt to build pugixml.cppJoerg Bornemann2021-12-101-2/+1
| | | | | | | | | | | | | | | pugixml is configured as header-only library by default. We must not compile pugixml.cpp. The qmake project file listed pugixml.cpp as source file, but it was not compiled, because qmake automatically detected that pugixml.cpp is included by pugixml.hpp. CMake does not have this automatism. Pick-to: 6.2 Fixes: QTBUG-97254 Change-Id: Ibaf434f326d42e2fdea79f359cc625338644ce4d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-12-091-3/+3
| | | | | Change-Id: Ic1adbc2cb193f00f359d0a3439c5c9d5ed015792 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Clean up license filesKai Köhne2021-12-084-1155/+451
| | | | | | | | | Only include license files that are actually referenced in the source text. Pick-to: 6.2 Change-Id: I2d04ef581a0b34d9cace3d1a1a790233fd921e5a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-12-061-3/+3
| | | | | Change-Id: I700e4c7f03a6fa4998b3a0e01f5bb63eb090b935 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android: trim down the manifest file from unneeded tagsAssam Boudjelthia2021-12-031-44/+38
| | | | | | | | | | Follow-up to 468e4a8242da3e795fe0b218f97cfd97a1d7e032. Fixes: QTBUG-95439 Pick-to: 6.2 Change-Id: I1584ca4b29b25e669c8844be1a6941025c93288f Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-12-021-3/+3
| | | | | Change-Id: I3c27ef682c425022ec79f43ff6206faa3761c24e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* OpenGL renderer: restore surface on context when shutting downPaul Lemire2021-11-301-27/+39
| | | | | | | | | | | | | | | | | | | | | When using a QQuickWidget and Qt3D, on shutdown and assert occurs. This is the result of the QQuickWidget expecting the surface on the context to be its own internal surface after the QQuickRenderControl has been invalidated. This conflict with what Qt3D does on shutdown as it makes the context current on its own internal offscreen surface on shutdown. Therefore, to fix this issue, we record the surface in use before Qt3D shuts down and we make the context current on it after Qt3D has shutdown. Arguably, the fix should really go in QQuickWidgetPrivate::invalidateRenderControl where the QQuickWidget should check that the current surface is indeed the one it expects and set it accordingly. Change-Id: I534dc330a30a2ad5d17a6416715d03206ef4b1c9 Pick-to: 6.2 5.15 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2021-11-261-3/+3
| | | | | Change-Id: I0c208a3a619826c3e3a384860a6aeea22b14d795 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "AnimationClip: fix the way we compute the duration"Paul Lemire2021-11-261-7/+4
| | | | | | | | | | | | Turns out we want the global clip duration and not the relative clip duration. Therefore global clip duration is always computed from 0. If the first keyframe is offset, then this means animation does nothing until t=offset. This reverts commit 7b23cb1ca5b32fcf24f889e79cec756786f86233. Pick-to: 6.2 5.15 Change-Id: Ic045a3cdea5eac4b8e35b75737e3ae6f00b9fa20 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* CMake: Fix configuration error if libassimp-dev is installedJoerg Bornemann2021-11-251-0/+18
| | | | | | | | | | | | | | | | | | | | | On Debian-based Linux distributions, we got errors like Imported target "WrapQt3DAssimp::WrapQt3DAssimp" includes non-existent path "/usr/lib/include" if the libassimp-dev package was installed. This is due to a packaging problem as described in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=973361 Work around this issue by fixing the known wrong include path. Pick-to: 6.2 Task-number: QTBUG-98420 Change-Id: If0052d012132ffddc056e20f1f65bf13723b0219 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Doc: Replace use of \oldcode-\newcodeLuca Di Sera2021-11-251-3/+5
| | | | | | | | | | | The command-pair was recently deprecated. The replacement code should produce an output that is equal to the previous one. Task-number: QTBUG-98499 Change-Id: I31a7cf8cb29e76dd73b676039b87c108af1bd1af Reviewed-by: Paul Wicking <paul.wicking@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 22:13:29 +0000