summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2.0' in qt/qtchartsv6.2.0-rc1Qt Submodule Update Bot2021-09-141-3/+3
| | | | | Change-Id: Icbb77957534a1ca80d5ca7c49aa3c2fc88647a6b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtchartsQt Submodule Update Bot2021-09-111-3/+3
| | | | | Change-Id: Ied09ebe86a921982e311724ce07b2fea007c9ca9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtchartsQt Submodule Update Bot2021-09-111-3/+3
| | | | | Change-Id: I305349f0fe2df947f2354b74c146dd296ea8bba2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtchartsQt Submodule Update Bot2021-09-101-3/+3
| | | | | Change-Id: I08ec22afef82041fbd57309c8961b8aad6e5c3cc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtchartsQt Submodule Update Bot2021-09-101-3/+3
| | | | | Change-Id: Iab5c10e39be9b4af724ac04268bcbd51d86d294a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-09-081-3/+3
| | | | | Change-Id: Ic5e1e2faa39d658f3a25ae9d1575c1c661638749 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-09-071-2/+2
| | | | | Change-Id: I3171640af5be55f4a98e8ccfd696f0f5ebacffd3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-09-071-3/+3
| | | | | Change-Id: I3483d43421096c821280e153c6b5d21fd0f8d3f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-09-061-2/+2
| | | | | Change-Id: Ic167f90994d809ea287e0849990c54cd4c113e10 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-09-051-3/+3
| | | | | Change-Id: I1081a230b0aab602edb421f8ee0fe3e68edc845f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Make sure to install designer files with non-prefixed buildsAndy Nichols2021-09-043-3/+6
| | | | | | | | | | | | | | It is not enough to just call qt_copy_or_install with a DESTINATION value prefixed with only ${INSTALL_QMLDIR}/ because for non-prefixed builds this will install relative to the directory this cmake file is in. Instead we have to combine ${QT_INSTALL_DIR} with the target path to make sure the final path is always correct. This pattern is used all over, so we muse do it as well. Change-Id: I327765dd61224ff070b07a48abc424fd7dadbb37 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 76c3558507da722f7f523d36dc1cf61fdb376084) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-09-041-3/+3
| | | | | Change-Id: Ibbc848e4458471e0ca5ba89abe62442f800e7dde Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-09-041-3/+3
| | | | | Change-Id: I94bc79560d5faa30eca048009c60f04aacf66084 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-09-031-3/+3
| | | | | Change-Id: If3b689094f917b74cc5dcae70a57ea42c6b85c85 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-09-031-3/+3
| | | | | Change-Id: I0359841b6a19c194e178b27138da58cf45328573 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-09-021-2/+2
| | | | | Change-Id: Ie5e81e1ac73e604b7b3d73c2fad100a5e2382061 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsv6.2.0-beta4Qt Submodule Update Bot2021-09-021-3/+3
| | | | | Change-Id: I2765a12d4323d3c0cd394e255ef54d4879e18a01 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-09-011-3/+3
| | | | | Change-Id: I787cd1d9ab22d9cde7578d4e48660bfb974162fe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-09-011-3/+3
| | | | | Change-Id: I9da99fe48c945fe795156f1a9a9a448722a2ca72 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-08-311-3/+3
| | | | | Change-Id: Ib256b0fe22f5ab8c396bbdd0981afe689e805bcd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-08-311-3/+3
| | | | | Change-Id: Iee95ce7a7fac53de2621d5667fe0f561d3371cd8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Points selection for QSplineSeriesAndrii Staikov2021-08-301-8/+66
| | | | | | | | | | | | Points selection was implemented for QLineSeries and QScatterSeries, but not for QSplineSeries. Now points selection is supported for QSplineSeries not only by lightMarkers, but also using QXYSeries::setSelectedColor() and QXYSeries::setMarkerSize(). [qtcharts][splineseries] Task-number: QTBUG-89445 Change-Id: I26d2ed5a16afffa6b9cd813330a182156bf33cff Reviewed-by: Lukasz Kosinski <lukasz@scythe-studio.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit c5d328b578477cddf4e094628a9dcc3b0912fa04) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add bar chart exampleAndrii Staikov2021-08-309-1/+388
| | | | | | | | | | | | Example shows using setBarSelected(). Selecting bars changes their color and information of selected/unselected bars. [QtCharts][Example] Added Example Task-number: QTBUG-89445 Change-Id: Ic863e763d2cfa552629f42afd1232c1f77b95e95 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 72d69b22d8da004fcb27e1a549cdda3f52b9c4af) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Support builds with ConanIikka Eklund2021-08-262-97/+43
| | | | | | | | | | | | | | | | | | | | Provide conanfile.py recipe to support building this module with Conan. The conanfile.py recipe inherits the main functionality from base class located in qt-conan-common.git. 'qt-configure-module(.bat)' and cmake is used for the builds. Dependencies (Conan requirements) are defined by the base class implementation which reads those from the 'dependencies.yaml' which is also used by the Coin/CI. Task-number: QTBUG-94854 Change-Id: Id8a082c850463370278ce072b7e1d00745b374d7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 6dc4b8457ce1f49c761dda5ed13d5165e64a9b81) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-08-261-3/+3
| | | | | Change-Id: I821f06c423aee189906c5231d13a9525e4fc217f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Drop \instantiates entryVenugopal Shivashankar2021-08-242-2/+0
| | | | | | | | | | | | | | Those C++ classes do not exist anymore. Fixes these qdoc warning: qt5/qtcharts/src/chartsqml2/declarativechart.cpp:80: (qdoc) warning: C++ class DeclarativeChart not found: \instantiates DeclarativeChart qt5/qtcharts/src/chartsqml2/declarativepolarchart.cpp:35: (qdoc) warning: C++ class DeclarativePolarChart not found: \instantiates DeclarativePolarChart Task-number: QTBUG-95860 Change-Id: Icfa42fe3d67496306a8e40096d7550da6f22e3d9 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 858d0e995f1cde3c96e73813488be406294ab0cb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-08-211-3/+3
| | | | | Change-Id: I6559c173faf4991bfd0ce1dd296235411efef150 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-08-201-3/+3
| | | | | Change-Id: Ia7ba1815f0e785e82115b92f5053d1ee80e34fdc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-08-191-3/+3
| | | | | Change-Id: I7d37b6044615e8a07d370ecedb827bc28e17a91e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Fix X axis labels to not draw over each other"Dimitrios Apostolou2021-08-191-12/+4
| | | | | | | | | | | | | | | | This reverts commit 5b6e1042bd0aa4514df71209e7784b23490dbd1e. It is reverted because it caused QTBUG-94998 (missing labels at the edges of axis). This revert reintroduces QTBUG-79218 (axis labels drawing over each other). A followup patch will fix it differently. Fixes: QTBUG-94998 Task-number: QTBUG-79218 Change-Id: I0dbb7e0a345feb9986bcf5d1d3e24d8dbea2277b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 4b056cf30d5870f73ec467a963fcaaa6ec6fab46) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Display selected points regardless of QXYSeries::lightMarker()Lukas Kosinski2021-08-197-27/+121
| | | | | | | | | | | | | | | | | | Selected points needs to be displayed regardless of the visibility of other points. It was correctly implemented when not using light markers concept, but it didn't work correctly with QXYSeries::lightMarker() set to null image and valid QXYSeries::selectedLightMarker(). The fix was to change some of the conditions in linechartitem.cpp, splinechartitem.cpp and scatterchartitem.cpp. There was also a change added to scatterchartitem to use QXYSeries::pointsVisible() setting. Task-number: QTBUG-89445 Change-Id: I6010bbf6b6f670f6b0694a7612d22e353d320154 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 1ba0ef016e9fef13fe35235cac208d0a762b324e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-08-181-3/+3
| | | | | Change-Id: I6b6ad16c5c21f261ce6868f61a562194e6826acb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix the qdoc warningsVenugopal Shivashankar2021-08-183-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | qt5/qtcharts/src/chartsqml2/declarativechart.cpp:80: (qdoc) warning: C++ class DeclarativeChart not found: \instantiates DeclarativeChart qt5/qtcharts/src/chartsqml2/declarativepolarchart.cpp:35: (qdoc) warning: C++ class DeclarativePolarChart not found: \instantiates DeclarativePolarChart qt5/qtcharts/src/charts/legend/qlegend.cpp:238: (qdoc) warning: Undocumented parameter 'attachedToChart' in QLegend::attachedToChartChanged() qt5/qtcharts/src/charts/barchart/qbarset.cpp:693: (qdoc) warning: Undocumented parameter 'color' in QBarSet::setSelectedColor() qt5/qtcharts/src/charts/xychart/qxyseries.cpp:1607: (qdoc) warning: Can't link to 'QXYSeries::selectedColor()' qt5/qtcharts/src/charts/xychart/qxyseries.cpp:1624: (qdoc) warning: Undocumented parameter 'size' in QXYSeries::setMarkerSize() qt5/qtcharts/src/charts/xychart/qxyseries.cpp:1585: (qdoc) warning: Can't link to 'QXYSeries::selectedColor()' Task-number: QTBUG-95860 Change-Id: Id91d07df2caaac6de5a19536abaa56bef9686ba5 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 621d29d8f26f33c5e74c0bc839fa289019ec1825) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-08-171-3/+3
| | | | | Change-Id: I376fb4f19f0296e337b42ad605e7bca015557579 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-1749-49/+49
| | | | | | | | Task-number: QTBUG-95636 Change-Id: I2ae5ba6164cb5ed450c8924d484d30167461c10d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 76fcbad6f08e490865c362ec02c02b13800c37cc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-08-171-3/+3
| | | | | Change-Id: Icbf9218e51726db12744065c7c408f1551e747bf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-08-171-3/+3
| | | | | Change-Id: I33f8c2368cc113fbd7e94fe73357d6f9aa372b3a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsv6.2.0-beta3Daniel Smith2021-08-121-3/+3
| | | | | Change-Id: I725b938bc675b38291da4874412a221a9de195cd Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Add module upgrade documentation pageMiikka Heikkinen2021-08-102-0/+58
| | | | | | | | Fixes: QTBUG-95307 Change-Id: Ifc5d59348d5f4c521e22a1aa7a30cef2f8dd57dd Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 002bbb637c25fac1617f8cd635ceca0fda62264b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-08-031-2/+2
| | | | | Change-Id: I43f8f05495e3a101403ca5f4aeaeec2b50d750e6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* LogValueAxis::labelFormat is a string, not a realAlbert Astals Cid2021-08-021-1/+1
| | | | | | | Change-Id: If00d0eb5c7ec10aba549393a235de5f6558e6a52 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit b084cc1c4917cd2eb22c5cabd569a8c71d755c67) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-07-291-3/+3
| | | | | Change-Id: I5ffdca718966efcaed6cb6c86ec498dce7c4e677 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-07-281-3/+3
| | | | | Change-Id: I5ce298e27584bcf760c357a2aa000253227d36e9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsv6.2.0-beta2Qt Submodule Update Bot2021-07-251-3/+3
| | | | | Change-Id: Ia639cf5268f51e066163f89566998bcb7d523948 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-07-241-3/+3
| | | | | Change-Id: Ib71780dff1fed1ad8aca014c7bbb4d3b02ca4a43 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-07-241-3/+3
| | | | | Change-Id: I8f3d02f5e2f0b8ccfaaa6abc917b06441db181a6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-07-231-3/+3
| | | | | Change-Id: I5a9568638eda9bc86769359dc793c1fa7eb41231 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-07-221-3/+3
| | | | | Change-Id: I64a885ea3ec479c5024e998b378a8c9dce4b3743 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-07-221-3/+3
| | | | | Change-Id: I29efaf96b8318d6683496cce2105b62fc2c95fde Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtchartsQt Submodule Update Bot2021-07-211-3/+3
| | | | | Change-Id: Iedf24f779fcdc7070bbfe2fe3b6dfc654c9d5b93 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>