diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:50:54 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:50:54 +0200 |
commit | 213a9c307dfef2209d217cb539554535c78f5003 (patch) | |
tree | 9d951f5648f400da842182b738fec408d6e148e2 | |
parent | 277f12d1e12987cc871d6e994435c258eca8cfe0 (diff) | |
parent | 4f66d1ffeecd95b4bf6666b71536c42dea7450ed (diff) |
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: I8de496e0fdba053dc1487d5315f536a206f59130
-rw-r--r-- | dist/changes-5.11.0 | 24 | ||||
-rw-r--r-- | src/charts/barchart/abstractbarchartitem.cpp | 5 | ||||
-rw-r--r-- | src/charts/barchart/abstractbarchartitem_p.h | 1 |
3 files changed, 30 insertions, 0 deletions
diff --git a/dist/changes-5.11.0 b/dist/changes-5.11.0 new file mode 100644 index 00000000..28417194 --- /dev/null +++ b/dist/changes-5.11.0 @@ -0,0 +1,24 @@ +Qt 5.11 introduces many new features and improvements as well as bugfixes +over the 5.10.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.11 series is binary compatible with the 5.10.x series. +Applications compiled for 5.10 will continue to run with 5.11. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.11.0 Changes * +**************************************************************************** + +- [QTBUG-64370] Add labelsPrecision property to bar charts +- [QTBUG-66319] Fix empty chart when using QHBoxPlotModelMapper +- [QTBUG-66712] Fix few cases of dividing by zero diff --git a/src/charts/barchart/abstractbarchartitem.cpp b/src/charts/barchart/abstractbarchartitem.cpp index 2d0d0e25..099079a6 100644 --- a/src/charts/barchart/abstractbarchartitem.cpp +++ b/src/charts/barchart/abstractbarchartitem.cpp @@ -726,6 +726,11 @@ void AbstractBarChartItem::calculateSeriesPositionAdjustmentAndWidth() } } +ChartAnimation *AbstractBarChartItem::animation() const +{ + return m_animation; +} + #include "moc_abstractbarchartitem_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/charts/barchart/abstractbarchartitem_p.h b/src/charts/barchart/abstractbarchartitem_p.h index 7cb96c77..7afd8ec8 100644 --- a/src/charts/barchart/abstractbarchartitem_p.h +++ b/src/charts/barchart/abstractbarchartitem_p.h @@ -71,6 +71,7 @@ public: virtual void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) = 0; virtual void applyLayout(const QVector<QRectF> &layout); virtual void setAnimation(BarAnimation *animation); + virtual ChartAnimation *animation() const; void setLayout(const QVector<QRectF> &layout); QRectF geometry() const { return m_rect;} void resetAnimation(); |