diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2018-04-23 12:31:04 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-04-23 10:55:33 +0000 |
| commit | 4f66d1ffeecd95b4bf6666b71536c42dea7450ed (patch) | |
| tree | 7789cbe2e504705fa04000534438ccd4db4e00b1 | |
| parent | 35523ecc002debb95414dfb78317814900dfa732 (diff) | |
Add missing overridev5.11.0-rc2v5.11.0-rc1v5.11.0
When deleting a series, the matching chartitem is queried for its
animation to stop it. As AbstractBarChartItem sets an animation, it has
to provide it to the owner to react properly.
Task-number: QTBUG-65552
Change-Id: I44c9c4db823558c78f2fb20cd17642f19160e16e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | src/charts/barchart/abstractbarchartitem.cpp | 5 | ||||
| -rw-r--r-- | src/charts/barchart/abstractbarchartitem_p.h | 1 |
2 files changed, 6 insertions, 0 deletions
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(); |