summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtdatavis3dDaniel Smith2021-07-301-3/+3
| | | | | Change-Id: I82fa4dd62757b5ebffaf60290ad887cbd4829f96 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-281-3/+3
| | | | | Change-Id: I02d8d7c93bc504c1880d8669ed6130948e520209 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-271-3/+3
| | | | | Change-Id: I0929d3b6872b9b9032c483a37c11aae4443203b7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-241-3/+3
| | | | | Change-Id: I6a90530722e2f01743766a7d3467ed4d4afbc4af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-231-3/+3
| | | | | Change-Id: Ifbbe2b223e77b21adafc780d53ac51e6d03cde19 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-221-3/+3
| | | | | Change-Id: I63844555a285ad46b996efb3e6b9ba507829329a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-211-3/+3
| | | | | Change-Id: Ie3fe6a5c9df0158e34c21547f40cd2b49f921d93 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-201-3/+3
| | | | | Change-Id: Iff5003e0c497c01f056e2f1e88ccc7264d562a1a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-191-3/+3
| | | | | Change-Id: Ibea24d6fd5dde21e76baeac45bbbcbff228fcc50 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-181-3/+3
| | | | | Change-Id: I602590a82df7a6c8c8d97533c57ca3e1c32da45e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-161-3/+3
| | | | | Change-Id: I76f80c739f7d30f00ec69d2b65ba502bf95422a4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-151-3/+3
| | | | | Change-Id: I57ef88b27d601a95ea662323f2029945ee9ff38f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-141-3/+3
| | | | | Change-Id: I34975a4efbec5569f1467a89c9d6887c86bac147 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-141-3/+3
| | | | | Change-Id: Ifaab0ef8c7df1c2e46ac7d84f178c32e12eec263 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-131-3/+3
| | | | | Change-Id: I3315c89c365dab338157d097b5b547e831e3c327 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-121-3/+3
| | | | | Change-Id: I529a245d38e9c73139e904694978e3f2d73a7687 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-091-3/+3
| | | | | Change-Id: Icf0940b6f66096f3448518bf4b2958763573d6f9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-081-3/+3
| | | | | Change-Id: I9fa4d52b4dc008f96c50199556587a869149b135 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-07-011-2/+2
| | | | | Change-Id: I92face6ba6635442b9fdeebff8cbb04e094467cb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Split other resources from QML_FILESUlf Hermann2021-06-301-0/+5
| | | | | | | | | As we have the RESOURCES argument to qt_add_qml_module now, we can as well use it. Pick-to: 6.2 Change-Id: I51311bb73bd200eecacf0d9e5e9bb8a2c7e60232 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-06-291-3/+3
| | | | | Change-Id: Id853e4eb1eb826751faaa2ed1dc7ec99d4d31526 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-06-281-2/+2
| | | | | Change-Id: I413c6ef56b3098008c058bb77bd290e49fb7152c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-06-261-3/+3
| | | | | Change-Id: I9174bc269f2eecf84ea408a3a7dda07ceb11f2b0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-06-261-2/+5
| | | | | Change-Id: I03e8fb0fba6ac5eb7749599b91eb62816b8eb0c9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add missing operator=Thiago Macieira2021-06-233-0/+4
| | | | | | | | | | | | | | | GCC 11 says depending on it is deprecated: bars3drenderer.cpp:237:42: required from here qtbase/include/QtCore/../../../../../../src/qt/qt6/qtbase/src/corelib/tools/qcontainertools_impl.h:159:18: warning: implicitly-declared ‘constexpr BarRenderItem& BarRenderItem::operator=(const BarRenderItem&)’ is deprecated [-Wdeprecated-copy] barrenderitem_p.h:51:5: note: because ‘BarRenderItem’ has user-provided ‘BarRenderItem::BarRenderItem(const BarRenderItem&)’ Note that copyable polymorphic classes are a big red flag. Change-Id: I7246c3e7bb894e0d9521fffd168af24d8f0cd727 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sami Varanka <sami.varanka@qt.io>
* Fix: Axis titles do not respect title fixedSami Varanka2021-06-221-0/+20
| | | | | | | | | | | | When a graph is rotated so that it is viewed from below the y axis gets flipped. However, x and z axis were not rotated correctly which caused them to be unvisible. Pick-to: 6.1 Fixes: QTBUG-94441 Change-Id: Ic56b910ce790526fd0460aa895ce978e6efd0b23 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Encapsulate raw string with QLatin1StringKai Köhne2021-06-221-1/+1
| | | | | | | | | Fixes warning C4996: 'QString::operator ==': Use fromUtf8, QStringLiteral, or QLatin1String Pick-to: 5.15 6.2 Change-Id: I54fc1a85fa7a91806c9f8026a7258e80c944cbdf Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-06-211-2/+2
| | | | | Change-Id: I7d3ac7c4a6ac9356e65fbb3614bcdfdb81a84a64 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-06-171-2/+2
| | | | | Change-Id: I4aeecc14fe130a24b0344af2170056afc51c76d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-06-171-2/+2
| | | | | Change-Id: I11bd1c00ecd137068adfa56970bcb4c3e1d5dbcf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove unneeded CMake variable assignmentsJoerg Bornemann2021-06-141-7/+0
| | | | | | | | | | | | Remove assignments to the transitionary variables QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS and QT_USE_FIXED_QT_ADD_RESOURCE_BASE. Both are not needed anymore. Task-number: QTBUG-94444 Change-Id: Ie54f38267a7529e96117e1be2b2bf2164372024f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix bargraph labels face wrong directionSami Varanka2021-06-111-3/+7
| | | | | | | | | | | | | | When the camera's X rotation is 180.0f, the labels were rotated to face wrong direction. The axis title labels do not respect the Abstract3DAxis's titleFixed property. Created a new bugreport QTBUG-94441. Pick-to: 5.15 6.1 Fixes: QTBUG-90371 Change-Id: I80115b8b363a7385dfd2cb1f004a05368549ed48 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Modernize and update to latest CMake APIUlf Hermann2021-06-1164-2857/+373
| | | | | | | | | | Use declarative registration for QML types, and separate the backing library from the plugin. Also, bump the revision numbers to account for Qt6 and drop the "2" from the source directory name. Change-Id: Ib48f90ad32a3624e7c31f1d2af9fcd92f069ee7f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix invisible text on macOS in qmlsurfacelayers exampleTomi Korpipaa2021-06-091-0/+1
| | | | | | | | Pick-to: 6.1 Task-number: QTBUG-94331 Change-Id: Ie75f8abe7860d1f26fba51ed62491e73554a29bd Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix manual test buildsTomi Korpipaa2021-06-0816-135/+190
| | | | | | Fixes: QTBUG-94256 Change-Id: I3747f1cf94925d3818f277521473cee086eb3082 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix Q3DScatter memory leakSami Varanka2021-06-082-1/+2
| | | | | | | | | | | | | | | | | | | | When using static optimization for scattergraph and series mesh type is not point mesh, the scatter3D renderer uses ScatterObjectBufferHelper's fullLoad. In the fullLoad old data buffers are deleted, if m_meshDataLoaded is set to true. However, at the beginning of the fullLoad, the flag was always set to false so old data buffers were never deleted. Moved the setting of the m_meshDataLoaded to false after the deletion of old buffers. Added similar code to scatterpointbufferhelper for consistency. Pick-to: 5.15 6.1 Fixes: QTBUG-80194 Change-Id: I2fd71af86b1fd73621074187f112fd9783df36df Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-06-071-2/+2
| | | | | Change-Id: I8f8e2b86d3b09fa6c4a6b0ec1be44c23485a426e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove references to multimedia and xmlpatternsLars Knoll2021-06-072-3/+1
| | | | | | | Those modules are not used anywhere inside this module. Change-Id: I21cafca4705172cfdaf4336cc4bfcc43d90306a7 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-06-051-2/+2
| | | | | Change-Id: I4d2263dfd6b64a33129d6602fcf4d5468a58865e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-06-051-2/+2
| | | | | Change-Id: Ic03c6f2e8ef65e191124cb752286bc4b5beb1475 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-06-051-2/+2
| | | | | Change-Id: I2af62ee3976fc03f03e2d8ecf4027f1dac134918 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Port to new CMake API for QMLUlf Hermann2021-06-052-66/+32
| | | | | | | | | This is a low-risk port that leaves all the procedural registration intact and just uses the CMake syntax. Change-Id: I5cfbf345977e5ea522ce2da6111c1fe293be6a2c Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix direct rendering doesn't show anythingSami Varanka2021-06-0415-58/+35
| | | | | | | | | | | | | | | | | | | | | | Rendering a graph directly to background didn't work in Qt 6 since it uses RHI and there is no way to not clear the color buffer before rendering. The graph uses direct OpenGL calls to render directly to background. Enabled direct rendering to qml3doscilloscope example. In addition, RenderDirectToBackground_NoClear got deprecated. When rendering directly to background, using non-transparent qml item as a background will hide the graph. This was already mentioned in the documentation but not clearly enough. Updated documentation for AbstractGraph3D. Pick-to: 6.1 Fixes: QTBUG-90665 Change-Id: I53081bac382ab89573359886e4f5c4b41be8e86d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-06-041-2/+2
| | | | | Change-Id: I4646d2819e88ef78dd91fe1894522e2948d8f805 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove audiolevels exampleTomi Korpipaa2021-06-0311-558/+0
| | | | | | | | | | QtMultimedia module has changed significantly between Qt 5 and Qt 6.2, so it is best to just remove this example and create a new one later on, if necessary. Fixes: QTBUG-94182 Change-Id: I21c6a342d294bec70b15fc702dd6d3749f3c0884 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-06-031-2/+2
| | | | | Change-Id: I049b5a32751e4c1a5a2a2b1f63b1c50c06ed8ff2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-06-011-2/+2
| | | | | Change-Id: I7993e1c977fd1a4550962560f03091c6b51aba1f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-06-011-2/+2
| | | | | Change-Id: I7c2efe3c470fadb9b9ae6b9c95dd05d9ab3ed87f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-05-311-2/+2
| | | | | Change-Id: I3419daea3a8dceb0d147aea8931445fbbadd7a8f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-05-281-2/+2
| | | | | Change-Id: Ie30feb85a36f4b095d39bb5f438c78baadd0525f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>