summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.0Qt Forward Merge Bot2020-04-221-0/+20
| |\ | |/ |/| | | Change-Id: Ie47bbb12811f283594b5a282842474a246436fdb
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | | | | | | | | | Change-Id: Ia827b4ccfb9213341be532fa858fb93a57a91af8
| * \ Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | | | | | | | | | | | Change-Id: I9f930b2d633b836a486626af3ee8f147e7d07a11
| | * | Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | + 9d1491a38e927893340bde238ffcefe970abd9f9 Bump version + e0c9c474989394ba13419d645326f4708f9ff8c3 Doc: List pen styles as a restriction for useOpenGL in QML API as well + 5d0f4509012b9512e55f0a2483440d81bf32502c Don't overlap the labels on a vertical axis instead of eliding Change-Id: I0dfa5d7fd5ff0d466abbfe32804de12351f82cd6 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-221-0/+24
| |/ |/| | | | | | | Change-Id: If92ba435334254f7abaec90746dc8a276c51d965 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Use Qt::SplitBehavior in preference to QString::SplitBehaviorv5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Edward Welbourne2020-03-023-3/+3
| | | | | | | | | | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: Ib453ad87f72f84e2d44cdf89a614abdc60651432 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Examples: add scrollbar to allow viewing all settings on AndroidAssam Boudjelthia2020-02-241-5/+11
| | | | | | | | | | | | | | | | | | | | This fix is most relevant for Android, currently, if the screen size is small the settings will show cramped and not usable. Thus, adding a scrollbar to fix that. Task-number: QTBUG-80717 Change-Id: Icafd5f108191990c8bbdf5ab21049e07bb40cecb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Fix deprecation warning against QDateTime(QDate)v5.15.0-beta1Edward Welbourne2020-02-181-1/+1
| | | | | | | | | | Change-Id: I6330fb72e9d003475227096cdcaeb46cbcba73c2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-152-11/+10
|\| | | | | | | Change-Id: I9a56af9aaeb6460136e8ad0c47f8e21bec21eba4
| * Don't overlap the labels on a vertical axis instead of elidingAndy Shaw2020-02-111-9/+8
| | | | | | | | | | | | | | | | | | | | We make sure that the title and the axis has their own available space to work with since the title will be rotated, but the axis labels are not. Therefore they work with different aspects of the axis rectangles. Fixes: QTBUG-81636 Change-Id: Ie797b5b5d7155d247a5dfec20a0e10cdebc1d097 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Doc: List pen styles as a restriction for useOpenGL in QML API as wellJoni Poikelin2020-02-071-2/+2
| | | | | | | | | | Change-Id: Ib90884a0efd0794e46313f713d7cc77693c99105 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I44732bf042db9437150bc58a5702a607a0a8226d
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: I8f91fef4ebeedab8f656fc20c7688084d245a88e
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\| | | | | | | Change-Id: I6e285c5094bbcb194803aeab5e0fb74fa61b3990
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: I5c3d8499e4931545fefa5920bce97a92c355d844
| | * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-091-0/+20
| |/ | | | | | | | | | | | | + 9fa7594a6ec84f5780536b6c99feed9279655acf Bump version Change-Id: Ied438c716c904448ffe20383868ed7b3702911b4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4d63977385104414abe119a4aa7470129ac438ab
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: Ie32e6e0ccbb6f69d0e26062565d65b5b4aa8ba2a
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+22
|\| | | | | | | Change-Id: I6a50066af0ea10151c80f3cfcd79504eda9e3700
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+22
| |\ | | | | | | | | | Change-Id: I04e98b22fdef0c9938bf1e0a82f5ba561f04dd5a
| | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.0Antti Kokko2019-11-191-0/+22
| |/ | | | | | | | | Change-Id: I454d9537f01aef9034dab095e1b073c1718b711d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Place minor tickmarks on horizontal axis correctlyPaul Olav Tvete2019-12-053-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like top and bottom was accidentally swapped when the dynamic tickmarks feature was added. This resulted in the minor tickmarks being drawn on the opposite edge of the canvas from the axis and the major tickmarks. Also modified the manual test to make drawing the grid optional, so the position of the tick marks can be seen more easily. Fixes: QTBUG-79349 Change-Id: Ia25c656d3d66ee0e6dd908504ec5c81cd2555bde Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-2527-215/+200
| | | | | | | | | | | | | | It is being deprecated. Change-Id: I1eafbce147e05028c93830bb882611d9eea58586 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-164-10/+7
|\| | | | | | | Change-Id: Ie0a7e8c6ce4e4adda07beb07fe397f0809b1c6ac
| * Doc: Fix documentation warningsTopi Reinio2019-11-114-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In qchartglobal.h we omit defining the QT_CHARTS_NAMESPACE and related macros for documentation builds, but qchart.h has one unguarded use which Clang complains about when generating the precompiled header. Use the Q_CLANG_QDOC macro to omit that one as well. Fix undocumented parameters and one duplicated \qmlproperty to bring the warning count to zero. Fixes: QTBUG-79830 Change-Id: Ifb047f5a5e2828f09857fbe6df79cbb77464357a Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+27
|\| | | | | | | Change-Id: I06308c2f411b4664f462a01214a2dcb0b696941a
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+27
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I71eb3076d643358befc6314f051f7455bcc41f68
| | * Merge remote-tracking branch 'origin/5.13.2' into 5.135.13Qt Forward Merge Bot2019-10-302-1/+28
| | |\ | | | | | | | | | | | | Change-Id: I064ec8575e836d7e3d8a6f804f625c1ee4ccdfe9
| | | * Add changes file for Qt 5.13.2v5.13.2Antti Kokko2019-10-151-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + dd65e383b2f900b8e661b678c746cd71fdef697e Add changes file for Qt 5.12.5 + e0b267cfb7c5f6ee84e66c52efb4dffb0c750984 Pass CategoryRange label change to parent QCategoryAxis + e757445355dbb3f3001fae49bb72113d7a52173d Fix trackpad scrolling on macOS + 289b9904a7c9ce241896f65509a19d0213def35c Round adjustedMin for offset value in ChartBarCategoryAxis + a692d9a826d864e91b668415aea266228c2ae323 Draw points that lie inside the chart rect only Change-Id: Idb490f4f63fec9c736914ba9558996edd95ef347 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ic8e95fde33d3834f20b253f07f0cefde61f36c64
* | | | Merge remote-tracking branch 'origin/5.14' into 5.15Simon Hausmann2019-10-163-10/+35
|\| | | | | | | | | | | | | | | Change-Id: I47e978267827c6515d193ff1ab29f72a1ccd2d60
| * | | Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2Simon Hausmann2019-10-163-10/+35
| |\| | | | | | | | | | | | | | Change-Id: I2570b3c739857b2fc4ffb26e9ccf1101f2803d87
| | * | Add dependency to texthtmlparserTimo Aarnipuro2019-10-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EditableAxisLabel uses QTextDocument::setHtml, which is only available if texthtmlparser is enabled. Change-Id: I1ef5ec101b79a173bb1ece1fe41d41a5b30bef0a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| | * | Fix removing rows from candlestick model mapperMiikka Heikkinen2019-10-152-10/+34
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | There is no guarantee removed rows are in correct order or that they are sequential, so don't assume so. Fixes: QTBUG-79188 Change-Id: I6ee6851ce881872d01486c600d4204faeb162d87 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-157-33/+49
|\| | | | | | | | | | | Change-Id: I6d6b7e405d4023a17e49c001040894980dca0c95
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-127-33/+49
| |\| | | | | | | | | | Change-Id: I0503eb5a77d2759d291f2bb85e7dd7b2c7eb07c2
| | * Draw points that lie inside the chart rect onlyMahmoud Badri2019-10-111-24/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only drawback of this approach is that if the pen has a transparent color, the overlap between a point and the graph line below it is clear. But it wasn't perfect anyway before this patch. The impact of this approach on performance is minimal. Task-number: QTBUG-62839 Change-Id: I4478d9136fe7ca1a1c6bf5dd5a3f459af63b953c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * Round adjustedMin for offset value in ChartBarCategoryAxisAssam Boudjelthia2019-10-102-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Using qCeil(adjustedMin) to calculate the offset caused some labels to be trimmed, rounding the value is more appropriate. Task-number: QTBUG-62230 Change-Id: I2c7c09ae50f8a4f4958653fa557159962da9a8a2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * Fix trackpad scrolling on macOSTomi Korpipaa2019-10-092-4/+20
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-77403 Change-Id: I8c6431412ba4b554affa69578b1c2ca3e08c7a7f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * Pass CategoryRange label change to parent QCategoryAxisMiikka Heikkinen2019-10-082-1/+9
| | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-78439 Change-Id: I1c0de505c73ea42e67947fed91a535a117a2ad5b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-013-3/+282
|\| | | | | | | | | | | Change-Id: Ie45d645e6b66aa18bd28a14c49ab9a89812cd5ee
| * | Update plugins.qmltypes for 5.14v5.14.0-beta1Kai Koehne2019-09-301-1/+280
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: I8b6ee8ff3f589a12d1cc6772a7d0ed74b9698740 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * | Explicitly override keyPressEvent methodsFredrik Orderud2019-09-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Done to fix annoying compiler warnings when building qtcharts. Task-number: QTBUG-78822 Change-Id: I8b6ee8fffa203000302f4fb99eb61c00b36d7850 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-212-0/+52
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-212-0/+52
|/| | | | |/ / | | | | | | Change-Id: I7415e8a51cfc14ef8a10b0c45db543f17eaf4aac
| * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-alpha1Qt Forward Merge Bot2019-09-172-0/+52
| |\ \
| | * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+52
| |/| | | | |/ | | | | | | Change-Id: Ibeafc19c8fabc7c271f4d0a2e2cf2bdb8b850c80
| | * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+25
| | |\
| | | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+25
| | |/| | | | | | | | | | | | | Change-Id: I1e6630c316929a6e2e9bef409d969fd567a9cccc
| | | * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+25
| | | |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 02:12:07 +0000