summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Qt3D Tests: includemocsMike Krus2022-06-2927-1/+64
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: I9b8175d7eac6891e64665335323bd81e9fce130c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qt3DExtras: includemocsMike Krus2022-06-2944-0/+88
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: Ia990c5ea9a3fdcef2fea94b471a743de13c52e3b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qt3DQuickRender: includemocsMike Krus2022-06-2918-0/+36
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: I0c4d948baeed1b6ac0c49e8b30f0ec23986f685c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qt3DQuickScene2D: includemocsMike Krus2022-06-294-0/+8
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: Idfb22dd3547a7448ec3f081091f07744cebefbc6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qt3DQuickAnimation: includemocsMike Krus2022-06-297-0/+14
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: I2f9a551d40b09e668f06c14867b615c258c6ad46 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qtqtquick3dcoreplugin: includemocsMike Krus2022-06-291-0/+2
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: I5ddf8e54977b793a13a3842ec3d5d70edc3ca30e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qtquick3dextrasplugin: includemocsMike Krus2022-06-291-0/+2
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: I79b5dfb8ac8fb2b211f629e419890a46adeaf103 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qtqtquickscene3dplugin: includemocsMike Krus2022-06-293-0/+5
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: I23bf369589484621cec9f85418e19c72717e5867 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qtquick3danimationplugin: includemocsMike Krus2022-06-291-0/+2
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: I0e4d2ed1aad665c2c59a383fb293dd6e201e66f3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qtquick3drenderplugin: includemocsMike Krus2022-06-291-0/+2
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: I583f4a7c50992cb9915f79be884485d62c67b161 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qtquick3dlogicplugin: includemocsMike Krus2022-06-291-0/+2
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: Ide18733970a6c79018aa5c50a2870e4aee99a326 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qtquick3dinputplugin: includemocsMike Krus2022-06-291-0/+2
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: Ibb8518412ed1b87114f8645d65ab319340a5b313 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Avoid clash with internal resources handling in static buildsMike Krus2022-06-291-1/+1
| | | | | | | | | | | | quick3d already defines a scene3d resource file, static build generates some symbols to load these. Avoid clash in symbol names by rename resource file here. (manual pick from dev as 6.4 was missing) Task-number: QTBUG-102883 Change-Id: I788f9ccd84bb885e9bc7cb785486a657a6d4ec4e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix 3D Render Capture crashed issueYAMAMOTO Atsushi2022-06-294-0/+8
| | | | | | | | | | | | | m_pendingRenderCaptureSendRequests is touched by different threads from Renderer::jobsDone and Renderer::executeCommandsSubmission. It causes Assert and crashes and shuould be protected with mutex. Task-number: QTBUG-104592 Change-Id: I489691caeba2772f544fe1e4716053caf9492696 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit ebc966272a8aee4b783645d52f13a88b652200b9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-06-281-4/+4
| | | | | Change-Id: I27863bb16d50908d9cf503b140c9bebc766211cc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* fix RHI Renderer build for qmakeYAMAMOTO Atsushi2022-06-281-0/+2
| | | | | | | | | | Add rhirenderetarget* files to pri file. These were added int the commit 0b36fd620f3b34714fd697425f8dbb8433ad188d Change-Id: Ibee9da40dbee18467e1d4c60429f46155ded859d Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 60d957b8a0530646028a01b28fa44230726c75a5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove unused local variableYAMAMOTO Atsushi2022-06-241-1/+0
| | | | | | | | | The local variable image is unused and has a duplicate name with the variable in the next lower scope. Change-Id: I2154042e8737b4dc53f2d4b3b47dd9ed292b9dec Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 489df1a7e1f1fb692b5ea745fa3c10d5f7296006) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use SPDX license identifiersLucie Gérard2022-06-222290-88639/+4718
| | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: I8105424281eed871037fa6c463871ca8829876b5 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 2f1bc82b35209aacd8d214a3c7e8e725bee85de6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-06-211-4/+4
| | | | | Change-Id: I735068c9f059299b2195796a9ae284c4313396fa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QAnimationCallback: De-inline dtor of polymorphic classMarc Mutz2022-06-213-2/+53
| | | | | | | | | | | ... fixing Clang -Wweak-vtables warnings, which we'll soon add to headersclean. Task-number: QTBUG-45582 Change-Id: Iead4123af1d68db2cba842bd6f07419c219f0b73 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 42f6556fd2f03724e60504648c2af5ea6db3a7c5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix Qt3D.Core type registration to be called in static buildsAlexandru Croitor2022-06-172-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The automatically generated type registrations function qml_register_types_Qt3D_Core was not called in static builds, because the quick3dcoreplugin target is using a custom qt3dquick3dcoreplugin.cpp file instead of an auto-generated one. Types were found correctly in a shared Qt build because the 3DQuick backing library was loaded by the dynamic plugin at runtime and the static initializer calling qml_register_types_Qt3D_Core was executed. In a static build, the linker would discard the qml_register_types_Qt3D_Core function (and the static initializer) because nothing was referencing it. Modify qt3dquick3dcoreplugin.cpp to manually reference the type registration file, just like an auto-generated source file would do it. A Q_IMPORT_PLUGIN(Qt3DQuick3DCorePlugin) which is link directly to applications via an object file then ensures that registrations succeeds. Amends 59fc9cacce5eca68c9dece3c30d6f11ee7693d4e Fixes: QTBUG-102328 Change-Id: I371b272c7c3a1d21aeeb68f45a26e4186c39c5c9 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 57fbc3b60f6ade591713092a723dcf696ced734b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix Light Uniform handlingPaul Lemire2022-06-164-22/+44
| | | | | | | | | | | | | | | | | | | | | | | * OpenGL Renderer: When we parse shaders we record standard uniform names (e.g mvp), light uniform names and other unknown uniform names in dedicated lists. However, when setting the light uniform values, instead of using the light uniform names lists to check whether a value could be set or not, we were using the unknown uniform names list and therefore, we ended up not setting the value. * RHI Renderer: When parsing the shaders to record uniform names, even though we iterate through uniform struct arrays and members, we were not recording the member names as uniform names. This prevented from ever being able to set a the value of a struct or array member uniform. Additionally, the way we handled introspecting and uploading UBOs made up of arrays of structs was incorrect. Task-number: QTBUG-95650 Task-number: QTBUG-100402 Change-Id: I7e33575906c1bb376fe8059174c09cda553930e4 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 3e71f4904ddcb9cac06027a0ade35acb02a6b67e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-06-141-4/+4
| | | | | Change-Id: Ie0a13c52f1da966a1062ec304037130a80aa6e5c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dv6.4.0-beta1Qt Submodule Update Bot2022-06-111-4/+4
| | | | | Change-Id: I0e42d0b0fb0bc6277bf37dde55f98af58bdacd1d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-06-081-4/+4
| | | | | Change-Id: I70735cb3bad0ee5ec1cbe364d9e06a39135cbb5b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix some compile warningsMike Krus2022-06-0331-133/+153
| | | | | | | | | | Mostly unsafe type conversions, and replacing deprecated APIs. Still can't remove the not-clean-build flags because of bug in qtbase. Pick-to: 6.3 Change-Id: I1e305be2cdf52ccd62949c023c999be347810dd5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2022-05-311-4/+4
| | | | | Change-Id: Iaceb6a40c2db7b371a35a0d1467bdddb99772302 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2022-05-241-4/+4
| | | | | Change-Id: Ic08cb64705edb273b6b5900fb448e5ccb72c0aae Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2022-05-181-4/+4
| | | | | Change-Id: Id7081f24ff309eec60739582b7a2b3b4350ae847 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix missing includesVille Voutilainen2022-05-177-0/+7
| | | | | | | | | | | These popped up on a developer build of the newest dev branch. I don't know whether there's been header refactoring churn or whether the devs and CI use pch, but I certainly couldn't build without these fixes, on Linux with GCC 11. Pick-to: 6.3 6.2 Change-Id: Ic3529a33f4bc5c339b22c523d0be811ffb977c06 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Move RHI command executer to separate namespaceMike Krus2022-05-174-7/+11
| | | | | | | | | | Clashes with same class in GL plugin when using static builds (iOS). I have no idea why it wasn't a problem before... Task-number: QTBUG-103218 Pick-to: 6.3 Change-Id: I4437c39fc2269c8e7461ca1ab5dc7a0284135cd1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Qt3D: replace qSwap with member-swap where possibleMarc Mutz2022-05-161-1/+1
| | | | | | | | | | | | | qSwap() is a monster that looks for ADL overloads of swap() and also detects the noexcept of the wrapped swap() function, so it should only be used when the argument type is unknown. In the vast majority of cases, the type is known to be efficiently std::swap()able or to have a member-swap. Call either of these. Task-number: QTBUG-97601 Pick-to: 6.3 6.2 Change-Id: I1f27dc458f2d57a71070e818583f2e90c82e600d Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2022-05-161-4/+4
| | | | | Change-Id: I66eaeb49e6f48b3b77a56831a333b99817816f97 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Conan: Enable recipe exclude options passed to qt-configure-moduleIikka Eklund2022-05-131-3/+3
| | | | | | | | | | | | | | | | | | | | Current implementation allows only to enable a leaf module feature and when setting the option/feature to 'no' it gets translated to not being passed at all to qt-configure-module. This change calls 'convert_qt_features_to_conan_options()' from qt-conan-common module which can correctly translate the given recipe options so that: -o option1=True -> qt-configure-module -feature-option1 -o option1=False -> qt-configure-module -no-feature-option1 Task-number: QTBUG-100073 Pick-to: 6.3 Change-Id: I91f1f793ac9d932b1aa20f475c335c2ddd504cef Reviewed-by: Toni Saario <toni.saario@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2022-05-121-4/+4
| | | | | Change-Id: I0a48ca724b5d990b855ce757ef05baa5ba44e383 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2022-05-111-4/+4
| | | | | Change-Id: I64dd40c9bc6db1ac774ebb15bdc84fbc204ca0ac Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add QtQml dependency to Qt3D.RenderMarco Bubke2022-05-111-0/+2
| | | | | | | | Missing parameter types from QtQml. Pick-to: 6.3 6.2 Change-Id: Ie694feaac7ac4adf10d988c2fda1420603083c05 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add QtQml dependency to Qt3D.InputMarco Bubke2022-05-111-0/+2
| | | | | | | | Missing parameter types from QtQml. Pick-to: 6.3 6.2 Change-Id: Ifdc0344948403cf457ed5c5bbf099fb3d0408073 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add QtQuick dependency to Qt3D.ExtrasMarco Bubke2022-05-111-1/+2
| | | | | | | | Missing parameter types from QtQuick. Adapt Qt3D.Logic to auto. Pick-to: 6.3 6.2 Change-Id: I33e1dfff15b091800f21f6953fa6af38f74300ce Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add QtQml and Qt3D.Render dependency to Qt3D.AnimationMarco Bubke2022-05-111-0/+3
| | | | | | | | Missing parameter types from QtQml and Qt3D.Render. Pick-to: 6.3 6.2 Change-Id: I9e90a5a5be9e9cbc76471bd53b5a6928aabc8a10 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add QtQuick dependency to Qt3D.CoreMarco Bubke2022-05-111-0/+2
| | | | | | | | | QQuickPropertyAnimation is referenced as prototype but there is no dependency declared to QtQuick where it is defined. Pick-to: 6.3 6.2 Change-Id: I54a1c2edd79180da4f92cfb73b851df20f3e28a7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2022-05-091-1/+1
| | | | | Change-Id: I5974f87c62be83a3db6650727ced53b375cd2bce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2022-05-051-4/+4
| | | | | Change-Id: I1984022c7d1d7ef29560cf654d886076efc09e01 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2022-04-281-4/+4
| | | | | Change-Id: Ie835662678ec593c7110860940d160fdc3d1664a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove uses of deprecated {QByteArray, QString}::count()Sona Kurazyan2022-04-275-6/+6
| | | | | Change-Id: Ic2da884f11d7578c9972e779fd350a0135e55431 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2022-04-191-4/+4
| | | | | Change-Id: If6b9148bbf791dbbcc6bec91301864eaca011e65 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix compilation of exampleMike Krus2022-04-191-1/+1
| | | | | | Task-number: QTBUG-101595 Change-Id: I9578d2943768c62ad57da9d19d9ca667a2dff3e9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2022-04-011-4/+4
| | | | | Change-Id: I0604771c3a8b9273106a94fab5b4b9339e6beea4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2022-03-311-4/+4
| | | | | Change-Id: Ia56c0b0c6e9d37c3807af133796ee10bb99b660d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2022-03-301-4/+4
| | | | | Change-Id: I2b611b2d8e717baad405b813fda53d34fe744895 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-06-25 04:17:19 +0000