summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-261-3/+3
| | | | | Change-Id: Iae7f140a05fe8e2b2e2f55eb5cda4542b80dd5c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add: Margin between series columns in Bars3DSami Varanka2021-08-2419-19/+194
| | | | | | | | | | | | | | Added a new property to Bars3D. The property controls the margin between the columns of series. It can be used to show bars belonging to same column, but different series side by side. Also added autotest for qml and cpp. Fixes: QTBUG-69036 Change-Id: I3c353e9097a8be8cafc05f8f5120e4266baa4a5c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-201-3/+3
| | | | | Change-Id: I205be9a16aed586907010e5a3d9f6bfee3862b28 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add: surfaceseries wireframecolor revisionSami Varanka2021-08-202-3/+3
| | | | | | | | Added revisioning to surfaceseries wireframecolor. Fixes: QTBUG-95923 Change-Id: I7962418ea02185be907c38d8b7cf879f1ebd88be Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-191-3/+3
| | | | | Change-Id: I2e8bd850aa1f3a71d96d4a75815e1b37c8a5ffdd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-181-3/+3
| | | | | Change-Id: I0669f961d9aa86b3eec0de2a62d5d9eb161dd21c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-181-3/+3
| | | | | Change-Id: I0b8e9cb87eabfe8431f2e3bb4cdadd4140f34c2b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Raise cmake_minimum_required to VERSION 3.16 in examplesJoerg Bornemann2021-08-1722-22/+22
| | | | | | | Pick-to: 6.2 Task-number: QTBUG-95636 Change-Id: I2ae5ba6164cb5ed450c8924d484d30167461c10d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-161-3/+3
| | | | | Change-Id: I28ce0c044a40a31c945adcfe29dfbc630e7c2765 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-161-1/+1
| | | | | Change-Id: Ied09de77c5b854132e3f619fb5fac2387a0de967 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-141-3/+3
| | | | | Change-Id: Iaf061b9810311bf946f4221e73aafbc8940932fc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-131-2/+2
| | | | | Change-Id: Ieb2deba33fed450ed34332fbaaf16b7aa0263efb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-121-3/+3
| | | | | Change-Id: Ia493f35c468ee0c2d65f46c057dbf809882c2279 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-121-3/+3
| | | | | Change-Id: Iae7b3d970776fe510576bdb0eac95ea5c7938867 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix: Nans at surfacedata row/column 0 render failSami Varanka2021-08-114-26/+358
| | | | | | | | | | | | | | | | If the first or last column or row of the data given to surfacedataproxy contains NaN values, the surfacedataproxy might fail to find the limit values for the axis. Changed limitValues function in surfacedataproxy so that if it doesn't find min/max values from the first/last column/row it continues from the next column/row. Added a test to verify that the limit values are found when first/last row contains NaN values. Pick-to: 6.2 Change-Id: Ica3eebb1c6072656f59394814c3fa5e334f12c54 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-101-2/+2
| | | | | Change-Id: I06cb322fd27a38da5a019de935375f42b9077d1c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-091-3/+3
| | | | | Change-Id: Ib30087c8ebb7c074fc9a765e223f39bb70bc8626 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix 2 examples for macOSTomi Korpipaa2021-08-091-1/+0
| | | | | | | | | | | The missing font in qmlscatter seems to cause the blank screen for some reason. Pick-to: 6.2 Fixes: QTBUG-94331 Change-Id: I0a83c60ed8f37dbea8ca285d7894a655ea3923f7 Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-061-3/+3
| | | | | Change-Id: Ib0b650e74d39d742589dfffc6530eb4c25937899 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add: Colorize surfaceseries wireframeSami Varanka2021-08-069-2/+80
| | | | | | | | | | | | | Added color property for surfaceseries wireframe. Modified surfaceseries cpptest and qmltest to test the added property. In addition, the documentation for the property was added. Modified qmlsurface example to use the new property. Fixes: QTBUG-64748 Change-Id: I18f56258cdba2b3270dce7c8313cbf17e499ff39 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-051-3/+3
| | | | | Change-Id: Ife69b0f9e286b1ed3565fb0bd62ded2b01f87bd9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix: Rotate and zoom don't work on androidSami Varanka2021-08-041-0/+3
| | | | | | | | | | | | | On touch controlled platforms, the AbstractDeclarative didn't get any touchevents. Fixed this by setting acceptTouchEvents to true in AbstractDeclarative constructor. Pick-to: 6.1 6.2 Fixes: QTBUG-94364 Change-Id: I072be80a942afc71e86e5c352d078a90baaa066c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Change name of help moduleKai Köhne2021-08-031-1/+1
| | | | | | | | | Make the name of the help project match the name of the installation directory. Pick-to: 6.2 Fixes: QTBUG-95270 Change-Id: I185f5d1c42dfd142cbf5d9104b342b559bd09a8e Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix: basegradient applied incorrectly to surfaceSami Varanka2021-08-031-1/+2
| | | | | | | | | | | | | When surface data contains NaN/Inf values, the basegradient might get applied incorrectly. Fixed the error by adding check for NaN/Inf in getNormalizedVertex. Pick-to: 6.1 Fixes: QTBUG-78767 Change-Id: I94d850f8ed21bc98dcbc4ba26b02989c1c1bf90b Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* 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>