summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtdatavis3dHEADdevQt Submodule Update Bot13 days1-3/+3
| | | | | Change-Id: I05bb9f7d21c8fd21a09ee6571baf41869060013e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot14 days1-3/+3
| | | | | Change-Id: I432c524a9c63fd61d5b6cf3db8907e6df38bdd99 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-10-081-3/+3
| | | | | Change-Id: Ibda023f8858a28ef63f23408a29fa1ed09f2335d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add row colors for Bar3DSeriesSami Varanka2021-10-0816-4/+964
| | | | | | | | | | | | | Added rowColors property for Bar3DSeries. The property can be used draw the individual rows in the series in different colors. Autotests and a manualtest for the property were added also. Fixes: QTBUG-96682 Change-Id: I5c4f778189d079206500a9289490792584eab2b9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-10-061-3/+3
| | | | | Change-Id: I71350d329eb11c8560faf1b168a2ba3e6274c717 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-10-051-3/+3
| | | | | Change-Id: Iea93b2bf96efa7326ddfb9663a1c4226dcb10d5f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-10-011-3/+3
| | | | | Change-Id: Ic80cba0a3b7ec08165ced923a90f49b55ef07acf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-09-291-3/+3
| | | | | Change-Id: Ib34bb32e567d36d293ce0cb2e04f4a4b63543082 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-09-271-3/+3
| | | | | Change-Id: I2e6d31cc2d1230d9206a265cc0564502763b8e4b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Migrate to autogenerated cpp exportsAlexey Edelev2021-09-2746-54/+46
| | | | | | | | | | | | Replace the hardcoded cpp exports with a generated one where it's applicable. Change the cpp export macro name to the autogenerated one. Task-number: QTBUG-90492 Change-Id: Iff6fbff102297feffd443b8b6fef61f5e8f135e5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add hasSeries method to Abstract3D graphSami Varanka2021-09-2419-4/+109
| | | | | | | | | | | | | Added a hasSeries method to Abstract3Dgraph. The method can be used to check whether a series has already been added to the graph. In addition, modified cpp and qml autotests to test the added method. Fixes: QTBUG-96683 Change-Id: I91f70ca15b6c5fbaa7691cd17bbfc2ef460c3d37 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-09-231-3/+3
| | | | | Change-Id: Ib4b9212d6cfcef64f99d7fdfb25beef786da80ee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Bump almost all cmake_minimum_required calls to 3.16Alexandru Croitor2021-09-221-1/+1
| | | | | | | | | | | | Needed for subsequent change that will check and error out if the version is lower than 3.16. We do that to ensure all policies introduced by CMake up to version 3.16 have their behavior set to NEW. Pick-to: 6.2 Task-number: QTBUG-95018 Change-Id: I144534fdbd2669135f483ec575651d62c88c036b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Remove .qmake.conf from this repositoryJoerg Bornemann2021-09-211-7/+0
| | | | | | | | | | | | | | This file was necessary for the qmake build and the CI. The qmake build is history, and the CI does now read .cmake.conf (see QTQAINFRA-4392). In addition to being superfluous, the existence of .qmake.conf triggers QTBUG-76140 when building Qt examples with qmake. Removing the file alleviates the symptoms of this bug. Fixes: QTBUG-92271 Change-Id: Ib2b5ec2e7ebefd5453e6dc3d2b7913dff9c59a43 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-09-211-3/+3
| | | | | Change-Id: Idebc6c9d8281efe3e85f658ff4dbb639c59b107c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-09-201-3/+3
| | | | | Change-Id: I44d966b79f71d37375cf1e819938d09127aab333 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-09-161-3/+3
| | | | | Change-Id: Ib30c6cdce2f273af5d926eda4ee2056ec68ab292 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump versionJani Heikkinen2021-09-142-2/+2
| | | | Change-Id: I772665107eee5dd3e2b7f1486250e4b577dacd0f
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-09-091-2/+2
| | | | | Change-Id: I31a37c596621241f9df48ed49612c6ec10276353 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-09-071-3/+3
| | | | | Change-Id: If46fd4eb774f3fc2390eaf4cdc094f5d6e9bb034 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-09-061-2/+2
| | | | | Change-Id: I3dbae6165b42153b7b9834daf779eaaa683a8dd3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix: QAbstract3DGraph orthoProjection docsSami Varanka2021-09-061-5/+0
| | | | | | | | | | | | | Changed the documentation for QAbstract3DGraph orthoProjection property. The documentation promised too much so the extra lines were removed. Pick-to: 5.15 6.1 6.2 Fixes: QTBUG-96206 Change-Id: I07b42cf359cf6570d2364be737cb2c1bc8294596 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-09-031-3/+3
| | | | | Change-Id: I89cafe43a6f75f92feaf14a3b3a66cc0d0dbea72 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Remove unsupported customFiltersKai Köhne2021-09-031-3/+0
| | | | | | | | | | customFilters defined in .qdocconf are not supported anymore by Qt Assistant since Qt 5.13. Therefore remove them from all .qdocconf files, also to avoid cargo-culting them to new help modules. Task-number: QTBUG-95987 Change-Id: I3f07ddc1657abaa59e5c0b6756bf7833bbfd85cd Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-09-021-3/+3
| | | | | Change-Id: Ie1c8a32730bd9d8ec045720ae407363841bf8e58 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix: change signals to take values by const refSami Varanka2021-09-029-12/+12
| | | | | | | | | | | Changed signals in declaratives to take their arguments as const ref when suitable. Pick-to: 6.1 6.2 Fixes: QTBUG-95941 Change-Id: I3d582422793ee2bfb4cb5251dcacd55d3d3acca9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-09-021-2/+2
| | | | | Change-Id: Ie9f0e427d6f84b7db5e497a3dcfd5ef383e68996 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-09-011-3/+3
| | | | | Change-Id: I9285d7c2f28575871aabeee743eb7d2d805ca217 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-311-2/+2
| | | | | Change-Id: Ie4c2dcbf5ab656781a3981af08050f7c9ddeb9ed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add: Support for 16-bit heightmapSami Varanka2021-08-3112-22/+539
| | | | | | | | | | | Added support for 16-bit heightmap in QHeightmapSurfaceDataProxy. In addition, added a manual test for testing the heightmap support. Fixes: QTBUG-74814 Change-Id: Ief028a459600680593e8859c9e7b51fb2e43203c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2021-08-311-3/+3
| | | | | Change-Id: I6f705fc1bdeb32c87c59d0a17109f40f8e1d3708 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Conan: Inherit recipe class from QtLeafModule for common functionalityIikka Eklund2021-08-262-98/+23
| | | | | | | | | | | | | | | | | The qt-conan-common package implements a base class for Qt leaf module recipes. The build steps in leaf modules are mostly identical so it makes sense to put those in the base class. Dependencies are read by the base class from the 'dependencies.yaml' which is the same file the CI system uses. Inheriting class needs to implement 'get_leaf_module_source_folder()'. Pick-to: 6.2 Task-number: QTBUG-94902 Change-Id: I7cec8a66bfaae3a75e93b1f31ee33c9defda4fe3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* 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>