summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into ↵v5.15.13-lts-lgpl5.15Tarja Sundqvist2024-01-043-2/+4
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I3220e710a1556a85c344e1086e5924d45595cf86
| * Blacklist tst_QBarSeries::mousehovered for sles-15Heikki Halmet2023-02-201-0/+2
| | | | | | | | | | | | | | | | Mousehovered is failing with SLES 15.4 Task-number: QTBUG-111293 Change-Id: I394a2386ed20434d99d0a415ca6f6588d6edcbce Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Bump version to 5.15.13Tarja Sundqvist2022-12-221-1/+1
| | | | | | | | | | Change-Id: If2e676134a164778879671ef8b46354864b72cee Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * Update legend marker after setting label textSami Varanka2022-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | When changing the text for legend marker it did not update the legenditem. Changed it to invalidate marker also instead of just the geometry. Fixes: QTBUG-107890 Change-Id: Ica0d431077f69df72ada456b3cfc7e8f91198b4c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 45a62936ab4467b0466eedb97a2a3f2234608f5a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into ↵v5.15.12-lts-lgplTarja Sundqvist2023-10-111-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ia43a8cd5ce78478e4c218df6a062ddb09f84c4e1
| * Bump version to 5.15.12Tarja Sundqvist2022-10-061-1/+1
| | | | | | | | Change-Id: Iddc38081064a9dddd4ee55179fa8c4b98d706d76
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-096-54/+50
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ia2a1c70299a7bf156285bc35364d0f654390ab36
| * Bump versionTarja Sundqvist2022-06-151-1/+1
| |
| * Fix axis vanishing with specific valuesJere Tuliniemi2022-06-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | Charting values 1000000000000 and 1000000000001 with QValueAxis would not work since qFuzzyCompare fails with those values. Fixes: QTBUG-102392 Change-Id: I06dd9b1a86da97d7cc5a59c7fd3696a8165c6205 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 14688ccb30d28273c1d4f2c245e9fa07442151ed) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Improve performance on QXYModelMapperTomi Korpipaa2022-06-131-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused variable, which is populated by calls to QXYSeries points() in a loop. Additionally add variables for column() and row() to avoid repeated calls to those. Fixes: QTBUG-99190 Change-Id: I3659a571ff7ef57c3db693c599f35f15227201ea Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit bf1eae298e30822dbace46ae126f462368abe791) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Replace code with simpler but equivalent codeDimitrios Apostolou2022-06-134-38/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The if-branching is unnecessary because ceil(a-b) == -floor(b-a) Also add comments to clarify subtle differences in seemingly identical code snippets. Fixes: QTBUG-103906 Change-Id: Idfd72e4aecf53805183f5b2741336d805fbfbb6a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 0d1f32381d70f0f551fd3a02040650938cd8ac6d)
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into ↵v5.15.10-lts-lgplTarja Sundqvist2023-04-242-5/+5
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I64764a9e428273ac5b1ef6a0d6eebe262f8eb0b8
| * Fix minor tick placement for horizontal axisJoni Poikelin2022-05-031-4/+4
| | | | | | | | | | | | | | | | Change-Id: Id7f87bc2cd087eb2f3e4da684386fca57115ae98 Fixes: QTBUG-101945 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 1c50218113d49f467a870054ea6813d61088d47a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionTarja Sundqvist2022-04-061-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgplTarja Sundqvist2023-03-231-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I34911bee9dd0c2964a914f44fe559b9cb14908d7
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-106-8/+24
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I9e48d2a6d616d248714a7539a0b14aefacae7734
| * Fix: QPieSlice docs don't mention HTML formattingSami Varanka2021-11-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a note to QPieSlice documentation to mention that the label string can be HTML formatted. Fixes: QTBUG-98282 Change-Id: Ia9bcd478e86d38228d9ff46053eedb13a0b876e1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 50eb5ad6a2854fc5d6acc45279d0bb3ee9b33411) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
| * Fix axes not being removed when sharedHatem ElKharashy2021-10-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Switching axes that is shared between multiple series causes them not to be removed. The axis must be detached from the series when removed so that it can be removed in the next iteration. Fixes: QTBUG-81278 Change-Id: Iba9e027333ed924ff985e36184f7e6d49d2124cf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 968e128f3379514b476ed21dd92cf2ac8f9f861d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Fix incorrect plotArea before resizeTomi Korpipaa2021-10-154-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | If plotArea is set inside ChartView, contentGeometry is updated too early and we end up with incorrect plotArea. Invalidate the layout to correct the geometry. Fixes: QTBUG-95870 Change-Id: I761125633bcbb8297e629b3e98d61e7d95975806 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit f78e11381f2dedcab4bda44e52b3c75d810766c4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-121-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ie6b9f30c5d08502953f725e89cc4883649a882ec
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: I93634a38ef6ee82286ea20075d83b08004efeec8
| * 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>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-163-14/+6
|\ \ | | | | | | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Idc0b47bf40bf2d010987d024eaccb4006720cf74
| * | Revert "Fix X axis labels to not draw over each other"Dimitrios Apostolou2021-08-301-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). Fixes: QTBUG-94998 Task-number: QTBUG-79218 Change-Id: I0dbb7e0a345feb9986bcf5d1d3e24d8dbea2277b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 4b056cf30d5870f73ec467a963fcaaa6ec6fab46)
| * Doc: Use correct return type for qmlpropertyPaul Wicking2021-06-141-1/+1
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-94469 Change-Id: Ice05acdcabdb5e54f3dcb60210171cea51e002eb Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Nico Vertriest <nico.vertriest@qt.io> (cherry picked from commit 663942a05dcfe5f77495491f0f740f1ddc430569) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-05-165-16/+72
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I31594ab27a7be14283f1e2b415540a6d28e2a5bc
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: I904e658301a63842841f4f80ca7bab6dbd28c7da
| * Fix X axis labels to not draw over each otherDimitrios Apostolou2021-05-121-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the label numbers on the Y axis become too wide then the plot area width is shrunk to accommodate for that. But the X axis label numbers were calculated for the wider X axis, and printed on the shrunk X axis, so they overlapped each other. This is addressed in the Qt::AlignBottom part of the fix. Presumably the same issue happens with different alignments so respective change has been applied to those too. Fixes: QTBUG-79218 Change-Id: I2ad8c62f8c8d6308ab13b9da42fa6bd5e9192ee3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 5b6e1042bd0aa4514df71209e7784b23490dbd1e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Add comments and clarify some codeDimitrios Apostolou2021-05-122-6/+13
| | | | | | | | | | | | | | Change-Id: Ib0280e18d8e788631ae3c11674398c2725cbafa6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit b1e5084099c28c0b937f4f9ab070d6d5556cf54d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Add text bounds cacheAntti Määttä2021-05-071-5/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance by caching recently used text bounds. Charts keeps requesting bounds for the same text multiple times. Store the recently requested bounds to a cache to improve performance. In android device reduces the frame time by about 30 % and in windows reduces the total time spent in native text function used to get the bounds from 8.5% to 3.1%. Fixes: QTBUG-59040 Change-Id: I8a2fd89f2f2076e0c9364618a4cdc2596e0087a1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 1fb4a3ef2bd86d650495e15a23c7efc1e600a59a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-074-10/+19
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I94a191b6b72d34172cdb2e55280f4b057520d4f2
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: Ib00958df8e689eec10eb1f4e7fbf4b2b2c09e47e
| * Doc: Fix issues in Q[H|V]XYModelMapper documentationTopi Reinio2021-03-022-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * The detailed description for these two types were swapped * Clarify the data model used for the mapper, and suggest a table model as a good fit * Link to the example that makes use of a mapper Fixes: QTBUG-80828 Change-Id: If45dce47e74c28eb76d248133bbbfd2e44555750 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit ef331c506ab960d2a6e22c17c4af199b1079ef73) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Only create the GLXYSeriesData if there is no existing dataAndy Shaw2021-02-231-1/+2
| | | | | | | | | | | | | | | | | | | | This ensures that there is no memory leak due to unnecessary creation of the GLXYSeriesData when setting the series data. Change-Id: Iec7966bbbf53e595ead780462c89bb3e1205854e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit eaf63689403df7f122591795d80ef126b8fb5eaa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Revert "Update the commercial license header to Qt Charts files"v5.15.3-lts-lgplTarja Sundqvist2021-03-22395-4345/+4345
|/ | | | | | | | | | | This reverts commit 9ac57c36d42d083d1767353c7eb817d96817d22e. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: Ib7588e49cc9322bd72e02ef7cf49c8577191b0ec Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update the commercial license header to Qt Charts filesTarja Sundqvist2021-01-27395-4345/+4345
| | | | | | | | | | | | | | | | | The commercial license header header.COMM was updated to the tqtc-qtcharts files. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4144 Change-Id: I87f9848863d619d3fa0f3b8d94f21c14a87fe869 Reviewed-by: Antti Kokko <antti.kokko@qt.io> Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io>
* QtCharts: Append branch condition fix in QLegendTamas Martinec2021-01-151-1/+1
| | | | | | | | | | | | | | | | | | Qlist insert was called with -1 as position in QLegendPrivate::handleCountChanged, as pos = indexOfSeries(series, m_markers) is used as insert pos, which has -1 if the series is not found in the markers. The branch condition that should handle this use case was mistaken and the else branch executed which was not inteded. The else branch was still functional since the insert position protection adjusted it to 0 but it gave an assert because of the -1 as insert position. The assert and warning for negative indices was added in 5.15, which is why there was no warning before. Corrected the condition. The issue doesn't look platform dependent. Fixes: QTBUG-85909 Change-Id: I78c7dba3b4793ad23f1508c11bd43bca8b4533ed Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add changes file for Qt 5.15.2Antti Kokko2020-10-291-0/+37
| | | | | | | | | | | | | - d759a753779f3ae4b5ae2cb6b16401b4663618ad Add changes file for Qt 5.15.1 + 1a25abd33bf65bae6434c7a7fdd747929ffe2d36 Bump version + c082168fba5deb930a01502c54bf2080af53b544 Add changes file for Qt 5.12.10 + 07f28ce1eab983a49e661855ee11ffbd624f0083 Prevent zoom-out beyond infinite linear max double values Change-Id: I2dabc0e6ce8f91aac3933b88d2e5b815041dc9b8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit a67f812548b008e3eedcd2bb9313828a195fd23b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: I89cc64181071d1ce4483e01fd3c365d2894a9668
* Prevent zoom-out beyond infinite linear max double valuesKeith Kyzivat2020-10-235-4/+24
| | | | | | | | | | | | | | | | When zooming out domains that include log axes, prevent zoom-out when the new zoom level would result in a max value that is above the upper range of double (represented as inf). Additionally, prevent zoom-out when the log value exceeds the number of pixels in the log axis dimension. Major gridlines are created at each integral log value, and it does not make sense to zoom out beyond such point. Task-number: QTBUG-75500 Change-Id: Icab72f600a84297d43da675c5757f6e63ae25119 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit e71430cd2b82cda52a2886c941b227eb6cdbcb7a)
* Add changes file for Qt 5.12.10Antti Kokko2020-10-161-0/+28
| | | | | | | Change-Id: I72b6420ab78a4d03cbcd50f8b24c84b75f3938c0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 754f8d15a01bae966c43749e3cc833d2def7e808) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: Ibcd75a20817fbf2340f3371c80e721d02df7ad09
* Add changes file for Qt 5.15.1Antti Kokko2020-08-261-0/+25
| | | | | | | | | | | + 985d9f42f7691a5b96f9d55b96c83e7f8debfee1 Shift the label to be inside the bar if it is going to be cut off + b1edcbc8b040455b76b1ac3c1762867c88e76287 Fix Clang 10 warning about misleading indentation + e073beeb0710913cd5faa0b2f570ca8383c58322 Bump version Change-Id: Id0a75ac78b4dfa2645c79e296035a9188e1c35f7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 68a2a439898f154279ef41dcc6e7164030d20d54) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: I3e331fc3f483bb0f53e5b25bc22e0816e6fc4c14
* Fix Clang 10 warning about misleading indentationThiago Macieira2020-05-201-1/+2
| | | | | | | | | | | It sees the "emit" and thinks it's blank space. qboxset.cpp:348:10: warning: misleading indentation; statement is not part of the previous 'for' [-Wmisleading-indentation] Change-Id: I99ab0f318b1c43b89888fffd160b5a7310c0a0d0 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 1015f3500a516bc235cbbbfef7df6e0e57e582da) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Shift the label to be inside the bar if it is going to be cut offAndy Shaw2020-05-182-8/+12
| | | | | | | Change-Id: I5616fa8a08da10f53a6aa43eb838ab44d63a4afb Pick-to: 5.15 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 378968011f8a59769f6881358b4f316ebec6c866)
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+24
|\ | | | | | | Change-Id: I86f9d550e5dcb1852b75becab0539cb8659f0d89
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 07:16:07 +0000