Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: Ia74b6e93eedfdd9c14d3085cec696a5b2ce35a56

3 files changed, 12 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();
diff --git a/src/charts/doc/src/index.qdoc b/src/charts/doc/src/index.qdoc
index 18d5cb0b..fa9b6ebb 100644
--- a/src/charts/doc/src/index.qdoc
+++ b/src/charts/doc/src/index.qdoc
@@ -57,6 +57,12 @@
 
     \snippet doc_src_qtcharts.pro 0
 
+    \section1 Licenses
+
+    Qt Charts is available under commercial licenses from \l{The Qt Company}.
+    In addition, it is available under the \l{GNU General Public License, version 3}.
+    See \l{Qt Licensing} for further details.
+
     \section1 Articles and Guides
     \list
         \li \l{Qt Charts Overview}