summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Rename shader and mesh resource filesTomi Korpipaa2022-10-112-4/+4
| | | | | | | | | | | | | | | | WASM gets a conflict with Multimedia if the resource file is named just shaders. Doing the same for meshes to avoid future conflicts with some other modules. Fixes: QTBUG-107505 Change-Id: I9107f270d8679d1a50ec8127d15cb0c50856eb7c Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io> Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Tuomo Pelkonen <tuomo.pelkonen@qt.io> Reviewed-by: Dilek Akcay <dilek.akcay@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit f691637777d31503f6681ed8c89c83e88c09a4c3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-10-071-3/+3
| | | | | Change-Id: Ie6ec7c9b8bff7204547d665fffb0db97080d9413 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-10-061-3/+3
| | | | | Change-Id: I509a2e8bf1bc32de6c391de8513aae55c24220a7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-10-031-3/+3
| | | | | Change-Id: Iff5078306b9f49f4908e88c790e44c12ced3b431 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-09-301-3/+3
| | | | | Change-Id: I8024792445138c2182292268dbc74fe28fb6baf5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-09-291-3/+3
| | | | | Change-Id: I55de551595cef9f3fb45dcb8b438cede4a28a788 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-09-281-3/+3
| | | | | Change-Id: Ibc6994267b1b15819148b0dc104483d486e794b2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-09-261-3/+3
| | | | | Change-Id: Ibee047abbd2e79bdd1e3aac71bfeb63c3e243b0a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-09-201-3/+3
| | | | | Change-Id: I3735aefb8fa1f95a3722323be916d03280158d33 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-09-191-3/+3
| | | | | Change-Id: I1dd3e61802a34a9bdf57ffaa6abf78854fc2b14a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.4.1Jani Heikkinen2022-09-161-1/+1
| | | | | Change-Id: Ibc59b16a16766ca94a50cfeb90069cb87ac90805 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-09-161-3/+3
| | | | | Change-Id: I79300cd2f7f72ac288c0e942e3ff8cd34b738f4f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-09-151-3/+3
| | | | | Change-Id: Ia4190119211fbdb6d49d50fc18bd41939b31fc98 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-09-141-3/+3
| | | | | Change-Id: I7e2b7f39b9310cb8c11a153ec3aea2480464c682 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-09-131-3/+3
| | | | | Change-Id: I8e8be463c76db47afcd9576c9dd90e31c79ef39d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-09-121-3/+3
| | | | | Change-Id: I47c47d5d3329e6bfbcecc2bd1ba96ec621b510e6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-09-091-3/+3
| | | | | Change-Id: I0eeaf0bfa29cfd18a2d194487d272b5fc6aa3eaa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-09-071-3/+3
| | | | | Change-Id: Id6f2f1cd09de7b8a58e2e7958f053534594ff154 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Do not crash if custom object load failsTomi Korpipaa2022-08-266-43/+70
| | | | | | | | | | | | | | | | There was no check for the existence of UVs or normals in an OBJ file. A check for those was added. Additionally a debug message was added in case model loading fails due to missing UVs or normals. Furthermore, we no more qFatal out when custom object loading fails. Fixes: QTBUG-105398 Change-Id: Ie2742fb4307fe117e313cedf8111bc8f460f9c7b Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io> Reviewed-by: Dilek Akcay Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 449f644df503dc409514cafd7b46ee8664e4d451) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dv6.4.0-beta4Qt Submodule Update Bot2022-08-261-3/+3
| | | | | Change-Id: I89eac4cf062fe8fdc484bc0eaf2e5598a86e89b6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-08-251-3/+3
| | | | | Change-Id: Iaf45168c4a60116da97e868d93f6b9dc450fc0eb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-08-221-3/+3
| | | | | Change-Id: I14ea28302a73c42d137c9be9704607664f609dc6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-08-181-3/+3
| | | | | Change-Id: I717ba0b9d5f8e74c0be253556dc4dedd754e0414 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-08-161-3/+3
| | | | | Change-Id: I311a036b621b5beacb8420d5396e5c00d11dd958 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-08-151-3/+3
| | | | | Change-Id: I6cb2919400854ec2abccd3bc748b493a83cf0bf9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dv6.4.0-beta3Qt Submodule Update Bot2022-08-111-3/+3
| | | | | Change-Id: I9658f8d7e64520788872520d9430fc0e92ecc4f3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-08-091-1/+1
| | | | | Change-Id: I438af9dab01113e376e9537dad693bda3ee913ab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-08-081-3/+3
| | | | | Change-Id: I9ca5d83c673c15e5eb295364c8c48ef9eac8c92a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-08-021-3/+3
| | | | | Change-Id: I60cc446fecde5a0904ecf508891f45885538e839 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-07-281-3/+3
| | | | | Change-Id: Icde576d2b2e3e71a07ec7ae0dc21845e94f29262 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-07-271-3/+3
| | | | | Change-Id: Icd3e39b287453d4dc3451eab7f545a10487f1923 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-07-251-3/+3
| | | | | Change-Id: I9c2f325d44ab375cff84a20f89211def42d0e0fd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Specify module headerKai Köhne2022-07-221-0/+1
| | | | | | | | | | | Fixes (qdoc) Could not find the module header in include paths for module "QtDataVis3D" Change-Id: I6d79454dbacc06805cea986b5f0739febed6a085 Reviewed-by: Luca Di Sera <luca.disera@qt.io> (cherry picked from commit f75554d082c46098c64719b8c41e254f0351e054) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-07-191-3/+3
| | | | | Change-Id: I6aa86c6cb9d150547b776641b85b3b7e9b219920 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-07-151-3/+3
| | | | | Change-Id: I57786811c68615e2cfd3ffa57fb8f91003006a9a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-07-131-3/+3
| | | | | Change-Id: Ia37d46cc1250f2f9cc2c53de88519226ba444ce9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix layering violation involving AbstractDeclarativeMarc Mutz2022-07-066-3/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying an ubsan build of qtdatavis3d, I get: abstract3dcontroller.cpp.o: undefined reference to `typeinfo for AbstractDeclarative' Turns out that AbstractDeclarative is defined in DataVisualizationQml, a separate library, which depends on DataVisualization. It seems this worked because Abstract3DController only used inline members of AbstractDeclarative, so a normal build doesn't need the class exported, even though it's curious that inline isReady() calls exported QQuickItem::isComponentLoaded() and the linker didn't complain. But an UBSan build requires the type_info, which isn't available, because the class wasn't exported, and cannot be made available because of the layering violation. To fix, Extract Superclass AbstractDeclarativeInterface that provides only the required isReady() function, but lives in DataVisualization, and have the real AbstractDeclarative inherit it. As a drive-by, make isReady() const. Fixes: QTBUG-104714 Change-Id: I0eb718746355f409a4105e2d53e79b7003fd8b22 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> (cherry picked from commit 24106d1e1c818b358f919ce5cbff219b5a9f8b6a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dv6.4.0-beta2Qt Submodule Update Bot2022-06-301-3/+3
| | | | | Change-Id: Ia73107f27fcb4df6e40fbd12cc87ab0cd157f92f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-06-281-3/+3
| | | | | Change-Id: I3d2beeab77ade5e44ad5c2d6b849a0a5ff9836ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* coin: Prepare for using qt-configure-module in instructionsAlexandru Croitor2022-06-241-3/+8
| | | | | | | | | | | | When using qt-configure-module, we need to check if widgets feature is disabled with configure-style syntax as well. Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: I44147123a4c36ab6b8dfebb2affdc8c4bcde7149 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 23c87e42c80bb7c5dfb4530c2e6f746c7693c0d8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-06-211-3/+3
| | | | | Change-Id: I7d0113fb1838180ffeb2e57f69a43666e727ae12 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix -Wunused-function on non-OSX platformsMarc Mutz2022-06-211-3/+1
| | | | | | | | | Found by headerscheck. Change-Id: If3c7e2a10132a1201a08db1fb9b71d0cdcd395ff Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> (cherry picked from commit 05b90ceb502c42a41b8acff3d6bc28bb66294a3a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-06-141-3/+3
| | | | | Change-Id: I4b42f31b4ea9d686628897d37a571442b0e0a5d3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use SPDX license identifiersLucie Gérard2022-06-13450-13100/+920
| | | | | | | | | | | | 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: I3b3112f5a36673b90fff0010f973d020886cf08d Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 7d498a8cf5fbebd1308d43fe6637bd4934f0bae4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dv6.4.0-beta1Qt Submodule Update Bot2022-06-111-3/+3
| | | | | Change-Id: Ia2f9c428789bf252d6f0f7269ca7d7189325693d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtdatavis3dQt Submodule Update Bot2022-06-081-3/+3
| | | | | Change-Id: I35cae7749d98cfc10ba7b7370a929223466bb6d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix manual test compilation errorsSami Varanka2022-06-0718-147/+546
| | | | | | | | | | | Many of the manual tests were not compiling, because many of the signals and slots had not compatible signatures. Change-Id: Ibd881e5cca37ec666cb160c95b948e064ac09e5d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit bc2e34b01b7b1633c58c63ad9fe9dca82dbd74d7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2022-05-311-3/+3
| | | | | Change-Id: I064fff7deaa0239a93d40feeb886df5f17b7fc6f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2022-05-271-3/+3
| | | | | Change-Id: I0104892c69f807a269d1943dc07f5bb85b3ceb95 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2022-05-241-3/+3
| | | | | Change-Id: If5611e0e7733bdbc41582a5d0b98c6dfaace2623 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>