Use QList instead of QVector

Notice the following API changes:

-void QXYSeries::replace(QVector<QPointF> points);
+void QXYSeries::replace(const QList<QPointF> &points);

-bool QAbstractBarSeries::append(QVector<QBarSet *> sets);
+bool QAbstractBarSeries::append(const QList<QBarSet *> &sets);

-void QAbstractBarSeries::barsetsAdded(QVector<QBarSet *> sets);
+void QAbstractBarSeries::barsetsAdded(const QList<QBarSet *> &sets);

-void QAbstractBarSeries::barsetsRemoved(QVector<QBarSet *> sets);
+void QAbstractBarSeries::barsetsRemoved(const QList<QBarSet *> &sets);

-bool QBoxPlotSeries::append(QVector<QBoxSet *> boxes);
+bool QBoxPlotSeries::append(const QList<QBoxSet *> &boxes);

-bool QBoxPlotSeries::append(QVector<QBoxSet *> boxes);
+bool QBoxPlotSeries::append(const QList<QBoxSet *> &boxes);

-void QBoxPlotSeries::boxsetsAdded(QVector<QBoxSet *> sets);
+void QBoxPlotSeries::boxsetsAdded(const QList<QBoxSet *> &sets);

-void QBoxPlotSeries::boxsetsRemoved(QVector<QBoxSet *> sets);
+void QBoxPlotSeries::boxsetsRemoved(const QList<QBoxSet *> &sets);

-bool QPieSeries::append(QVector<QPieSlice *> slices);
+bool QPieSeries::append(const QList<QPieSlice *> &slices);

-QPieSlice *QPieSeries::append(QString label, qreal value);
+QPieSlice *QPieSeries::append(const QString &label, qreal value);

-void QPieSeries::added(QVector<QPieSlice *> slices);
+void QPieSeries::added(const QList<QPieSlice *> &slices);

-void QPieSeries::removed(QVector<QPieSlice *> slices);
+void QPieSeries::removed(const QList<QPieSlice *> &slices);

These should be source compatible changes.

Task-number: QTBUG-84469
Change-Id: I153796e9d8244c8e22819993ef26aa91e7b71f99
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>

139 files changed, 507 insertions, 493 deletions

diff --git a/examples/charts/chartthemes/themewidget.cpp b/examples/charts/chartthemes/themewidget.cpp
index 93894972..37849f08 100644
--- a/examples/charts/chartthemes/themewidget.cpp
+++ b/examples/charts/chartthemes/themewidget.cpp
@@ -184,7 +184,7 @@ QChart *ThemeWidget::createAreaChart() const
         for (int j(0); j < m_dataTable[i].count(); j++) {
             Data data = m_dataTable[i].at(j);
             if (lowerSeries) {
-                const auto &points = lowerSeries->pointsVector();
+                const auto &points = lowerSeries->points();
                 upperSeries->append(QPointF(j, points[i].y() + data.first.y()));
             } else {
                 upperSeries->append(QPointF(j, data.first.y()));
diff --git a/src/charts/animations/axisanimation.cpp b/src/charts/animations/axisanimation.cpp
index a5db92e0..bc6376c2 100644
--- a/src/charts/animations/axisanimation.cpp
+++ b/src/charts/animations/axisanimation.cpp
@@ -31,7 +31,7 @@
 #include <private/chartaxiselement_p.h>
 #include <private/qabstractaxis_p.h>
 
-Q_DECLARE_METATYPE(QVector<qreal>)
+Q_DECLARE_METATYPE(QList<qreal>)
 
 QT_CHARTS_BEGIN_NAMESPACE
 
@@ -63,7 +63,7 @@ void AxisAnimation::setAnimationPoint(const QPointF &point)
     m_point = point;
 }
 
-void AxisAnimation::setValues(QVector<qreal> &oldLayout, QVector<qreal> &newLayout)
+void AxisAnimation::setValues(QList<qreal> &oldLayout, const QList<qreal> &newLayout)
 {
     if (state() != QAbstractAnimation::Stopped) stop();
 
@@ -119,14 +119,14 @@ void AxisAnimation::setValues(QVector<qreal> &oldLayout, QVector<qreal> &newLayo
 
 QVariant AxisAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
 {
-    QVector<qreal> startVector = qvariant_cast<QVector<qreal> >(start);
-    QVector<qreal> endVecotr = qvariant_cast<QVector<qreal> >(end);
-    QVector<qreal> result;
+    const auto startList = qvariant_cast<QList<qreal>>(start);
+    const auto endList = qvariant_cast<QList<qreal>>(end);
+    QList<qreal> result;
 
-    Q_ASSERT(startVector.count() == endVecotr.count()) ;
+    Q_ASSERT(startList.count() == endList.count());
 
-    for (int i = 0; i < startVector.count(); i++) {
-        qreal value = startVector[i] + ((endVecotr[i] - startVector[i]) * progress);
+    for (int i = 0; i < startList.count(); i++) {
+        const qreal value = startList[i] + ((endList[i] - startList[i]) * progress);
         result << value;
     }
     return QVariant::fromValue(result);
@@ -135,12 +135,11 @@ QVariant AxisAnimation::interpolated(const QVariant &start, const QVariant &end,
 
 void AxisAnimation::updateCurrentValue(const QVariant &value)
 {
-    if (state() != QAbstractAnimation::Stopped) { //workaround
-        QVector<qreal> vector = qvariant_cast<QVector<qreal> >(value);
-        m_axis->setLayout(vector);
+    if (state() != QAbstractAnimation::Stopped) { // workaround
+        const QList<qreal> list = qvariant_cast<QList<qreal>>(value);
+        m_axis->setLayout(list);
         m_axis->updateGeometry();
     }
-
 }
 
 QT_CHARTS_END_NAMESPACE
diff --git a/src/charts/animations/axisanimation_p.h b/src/charts/animations/axisanimation_p.h
index b094a915..e03e982e 100644
--- a/src/charts/animations/axisanimation_p.h
+++ b/src/charts/animations/axisanimation_p.h
@@ -55,7 +55,8 @@ public:
     ~AxisAnimation();
     void setAnimationType(Animation type);
     void setAnimationPoint(const QPointF &point);
-    void setValues(QVector<qreal> &oldLayout, QVector<qreal> &newLayout);
+    void setValues(QList<qreal> &oldLayout, const QList<qreal> &newLayout);
+
 protected:
     QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const override;
     void updateCurrentValue(const QVariant &value) override;
diff --git a/src/charts/animations/baranimation.cpp b/src/charts/animations/baranimation.cpp
index 9ab942fb..e82fdb7a 100644
--- a/src/charts/animations/baranimation.cpp
+++ b/src/charts/animations/baranimation.cpp
@@ -30,7 +30,7 @@
 #include <private/baranimation_p.h>
 #include <private/abstractbarchartitem_p.h>
 
-Q_DECLARE_METATYPE(QVector<QRectF>)
+Q_DECLARE_METATYPE(QList<QRectF>)
 
 QT_CHARTS_BEGIN_NAMESPACE
 
@@ -48,19 +48,19 @@ BarAnimation::~BarAnimation()
 
 QVariant BarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
 {
-    QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
-    QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
-    QVector<QRectF> result;
+    const QList<QRectF> startList = qvariant_cast<QList<QRectF>>(from);
+    const QList<QRectF> endList = qvariant_cast<QList<QRectF>>(to);
+    QList<QRectF> result;
 
-    Q_ASSERT(startVector.count() == endVector.count());
+    Q_ASSERT(startList.count() == endList.count());
 
-    for (int i = 0; i < startVector.count(); i++) {
-        QRectF start = startVector[i].normalized();
-        QRectF end = endVector[i].normalized();
-        qreal x1 = start.left() + progress * (end.left() - start.left());
-        qreal x2 = start.right() + progress * (end.right() - start.right());
-        qreal y1 = start.top() + progress * (end.top() - start.top());
-        qreal y2 = start.bottom() + progress * (end.bottom() - start.bottom());
+    for (int i = 0; i < startList.count(); i++) {
+        const QRectF start = startList[i].normalized();
+        const QRectF end = endList[i].normalized();
+        const qreal x1 = start.left() + progress * (end.left() - start.left());
+        const qreal x2 = start.right() + progress * (end.right() - start.right());
+        const qreal y1 = start.top() + progress * (end.top() - start.top());
+        const qreal y2 = start.bottom() + progress * (end.bottom() - start.bottom());
 
         QRectF value(QPointF(x1, y1), QPointF(x2, y2));
         result << value.normalized();
@@ -72,12 +72,12 @@ void BarAnimation::updateCurrentValue(const QVariant &value)
 {
     if (state() != QAbstractAnimation::Stopped) { //workaround
 
-        QVector<QRectF> layout = qvariant_cast<QVector<QRectF> >(value);
+        const QList<QRectF> layout = qvariant_cast<QList<QRectF>>(value);
         m_item->setLayout(layout);
     }
 }
 
-void BarAnimation::setup(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
+void BarAnimation::setup(const QList<QRectF> &oldLayout, const QList<QRectF> &newLayout)
 {
     QVariantAnimation::KeyValues value;
     setKeyValues(value); //workaround for wrong interpolation call
diff --git a/src/charts/animations/baranimation_p.h b/src/charts/animations/baranimation_p.h
index 9d0af101..8cf840c1 100644
--- a/src/charts/animations/baranimation_p.h
+++ b/src/charts/animations/baranimation_p.h
@@ -58,7 +58,7 @@ public: // from QVariantAnimation
     QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const override;
     void updateCurrentValue(const QVariant &value) override;
 
-    void setup(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
+    void setup(const QList<QRectF> &oldLayout, const QList<QRectF> &newLayout);
 
 protected:
     AbstractBarChartItem *m_item;
diff --git a/src/charts/animations/boxwhiskersanimation.cpp b/src/charts/animations/boxwhiskersanimation.cpp
index 8bb5c25e..e4fca1b7 100644
--- a/src/charts/animations/boxwhiskersanimation.cpp
+++ b/src/charts/animations/boxwhiskersanimation.cpp
@@ -32,7 +32,7 @@
 #include <private/boxplotchartitem_p.h>
 #include <private/boxwhiskersdata_p.h>
 
-Q_DECLARE_METATYPE(QVector<QRectF>)
+Q_DECLARE_METATYPE(QList<QRectF>)
 Q_DECLARE_METATYPE(QT_CHARTS_NAMESPACE::BoxWhiskersData)
 Q_DECLARE_METATYPE(qreal)
 
@@ -89,7 +89,7 @@ QVariant BoxWhiskersAnimation::interpolated(const QVariant &from, const QVariant
 
 void BoxWhiskersAnimation::updateCurrentValue(const QVariant &value)
 {
-    BoxWhiskersData data = qvariant_cast<BoxWhiskersData>(value);
+    const BoxWhiskersData data = qvariant_cast<BoxWhiskersData>(value);
     m_box->setLayout(data);
 }
 
diff --git a/src/charts/animations/candlestickbodywicksanimation.cpp b/src/charts/animations/candlestickbodywicksanimation.cpp
index aae5c0ff..e84ee692 100644
--- a/src/charts/animations/candlestickbodywicksanimation.cpp
+++ b/src/charts/animations/candlestickbodywicksanimation.cpp
@@ -31,7 +31,7 @@
 #include <private/candlestickanimation_p.h>
 #include <private/candlestickbodywicksanimation_p.h>
 
-Q_DECLARE_METATYPE(QVector<QRectF>)
+Q_DECLARE_METATYPE(QList<QRectF>)
 Q_DECLARE_METATYPE(QT_CHARTS_NAMESPACE::CandlestickData)
 Q_DECLARE_METATYPE(qreal)
 
@@ -80,7 +80,7 @@ void CandlestickBodyWicksAnimation::setEndData(const CandlestickData &endData)
 
 void CandlestickBodyWicksAnimation::updateCurrentValue(const QVariant &value)
 {
-    CandlestickData data = qvariant_cast<CandlestickData>(value);
+    const CandlestickData data = qvariant_cast<CandlestickData>(value);
     m_candlestick->setLayout(data);
 }
 
diff --git a/src/charts/animations/splineanimation.cpp b/src/charts/animations/splineanimation.cpp
index bc625532..6057dd89 100644
--- a/src/charts/animations/splineanimation.cpp
+++ b/src/charts/animations/splineanimation.cpp
@@ -31,7 +31,7 @@
 #include <private/splinechartitem_p.h>
 #include <QtCore/QDebug>
 
-Q_DECLARE_METATYPE(QVector<QPointF>)
+Q_DECLARE_METATYPE(QList<QPointF>)
 Q_DECLARE_METATYPE(SplineVector)
 
 QT_CHARTS_BEGIN_NAMESPACE
@@ -47,7 +47,9 @@ SplineAnimation::~SplineAnimation()
 {
 }
 
-void SplineAnimation::setup(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldControlPoints, QVector<QPointF> &newControlPoints, int index)
+void SplineAnimation::setup(const QList<QPointF> &oldPoints, const QList<QPointF> &newPoints,
+                            const QList<QPointF> &oldControlPoints,
+                            const QList<QPointF> &newControlPoints, int index)
 {
     if (newPoints.count() * 2 - 2 != newControlPoints.count() || newControlPoints.count() < 2) {
         m_valid = false;
@@ -179,7 +181,7 @@ QVariant SplineAnimation::interpolated(const QVariant &start, const QVariant &en
 void SplineAnimation::updateCurrentValue(const QVariant &value)
 {
     if (state() != QAbstractAnimation::Stopped && m_valid) { //workaround
-        QPair<QVector<QPointF >, QVector<QPointF > > pair = qvariant_cast< QPair< QVector<QPointF>, QVector<QPointF> > >(value);
+        const auto pair = qvariant_cast<QPair<QList<QPointF>, QList<QPointF>>>(value);
         m_item->setGeometryPoints(pair.first);
         m_item->setControlGeometryPoints(pair.second);
         m_item->updateGeometry();
diff --git a/src/charts/animations/splineanimation_p.h b/src/charts/animations/splineanimation_p.h
index 46f58ac8..9a92d165 100644
--- a/src/charts/animations/splineanimation_p.h
+++ b/src/charts/animations/splineanimation_p.h
@@ -43,7 +43,7 @@
 #include <QtCharts/private/qchartglobal_p.h>
 #include <QtCore/QPointF>
 
-typedef  QPair<QVector<QPointF >, QVector<QPointF > >  SplineVector;
+typedef QPair<QList<QPointF>, QList<QPointF>> SplineVector;
 
 QT_CHARTS_BEGIN_NAMESPACE
 
@@ -54,7 +54,9 @@ class Q_CHARTS_PRIVATE_EXPORT SplineAnimation : public XYAnimation
 public:
     SplineAnimation(SplineChartItem *item, int duration, QEasingCurve &curve);
     ~SplineAnimation();
-    void setup(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldContorlPoints, QVector<QPointF> &newControlPoints, int index = -1);
+    void setup(const QList<QPointF> &oldPoints, const QList<QPointF> &newPoints,
+               const QList<QPointF> &oldContorlPoints, const QList<QPointF> &newControlPoints,
+               int index = -1);
 
 protected:
     QVariant interpolated(const QVariant &start, const QVariant &end, qreal progress) const override;
diff --git a/src/charts/animations/xyanimation.cpp b/src/charts/animations/xyanimation.cpp
index 4cfa5972..2ec87c91 100644
--- a/src/charts/animations/xyanimation.cpp
+++ b/src/charts/animations/xyanimation.cpp
@@ -31,7 +31,7 @@
 #include <private/xychart_p.h>
 #include <QtCore/QDebug>
 
-Q_DECLARE_METATYPE(QVector<QPointF>)
+Q_DECLARE_METATYPE(QList<QPointF>)
 
 QT_CHARTS_BEGIN_NAMESPACE
 
@@ -50,7 +50,7 @@ XYAnimation::~XYAnimation()
 {
 }
 
-void XYAnimation::setup(const QVector<QPointF> &oldPoints, const QVector<QPointF> &newPoints, int index)
+void XYAnimation::setup(const QList<QPointF> &oldPoints, const QList<QPointF> &newPoints, int index)
 {
     m_type = NewAnimation;
 
@@ -103,29 +103,29 @@ void XYAnimation::setup(const QVector<QPointF> &oldPoints, const QVector<QPointF
 
 QVariant XYAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
 {
-    QVector<QPointF> startVector = qvariant_cast<QVector<QPointF> >(start);
-    QVector<QPointF> endVector = qvariant_cast<QVector<QPointF> >(end);
-    QVector<QPointF> result;
+    const auto startList = qvariant_cast<QList<QPointF>>(start);
+    const auto endList = qvariant_cast<QList<QPointF>>(end);
+    QList<QPointF> result;
 
     switch (m_type) {
 
     case ReplacePointAnimation:
     case AddPointAnimation:
     case RemovePointAnimation: {
-        if (startVector.count() != endVector.count())
+        if (startList.count() != endList.count())
             break;
 
-        for (int i = 0; i < startVector.count(); i++) {
-            qreal x = startVector[i].x() + ((endVector[i].x() - startVector[i].x()) * progress);
-            qreal y = startVector[i].y() + ((endVector[i].y() - startVector[i].y()) * progress);
+        for (int i = 0; i < startList.count(); i++) {
+            qreal x = startList[i].x() + ((endList[i].x() - startList[i].x()) * progress);
+            qreal y = startList[i].y() + ((endList[i].y() - startList[i].y()) * progress);
             result << QPointF(x, y);
         }
 
     }
     break;
     case NewAnimation: {
-        for (int i = 0; i < endVector.count() * qBound(qreal(0), progress, qreal(1)); i++)
-            result << endVector[i];
+        for (int i = 0; i < endList.count() * qBound(qreal(0), progress, qreal(1)); i++)
+            result << endList[i];
     }
     break;
     default:
@@ -140,8 +140,8 @@ void XYAnimation::updateCurrentValue(const QVariant &value)
 {
     if (state() != QAbstractAnimation::Stopped) { //workaround
 
-        QVector<QPointF> vector = qvariant_cast<QVector<QPointF> >(value);
-        m_item->setGeometryPoints(vector);
+        const auto list = qvariant_cast<QList<QPointF>>(value);
+        m_item->setGeometryPoints(list);
         m_item->updateGeometry();
         m_item->setDirty(true);
         m_dirty = false;
diff --git a/src/charts/animations/xyanimation_p.h b/src/charts/animations/xyanimation_p.h
index 9ce36e77..6d7f4140 100644
--- a/src/charts/animations/xyanimation_p.h
+++ b/src/charts/animations/xyanimation_p.h
@@ -54,7 +54,7 @@ protected:
 public:
     XYAnimation(XYChart *item, int duration, QEasingCurve &curve);
     ~XYAnimation();
-    void setup(const QVector<QPointF> &oldPoints, const QVector<QPointF> &newPoints, int index = -1);
+    void setup(const QList<QPointF> &oldPoints, const QList<QPointF> &newPoints, int index = -1);
     Animation animationType() const { return m_type; };
 
 protected:
@@ -68,8 +68,8 @@ protected:
     int m_index;
 private:
     XYChart *m_item;
-    QVector<QPointF> m_oldPoints;
-    QVector<QPointF> m_newPoints;
+    QList<QPointF> m_oldPoints;
+    QList<QPointF> m_newPoints;
 };
 
 QT_CHARTS_END_NAMESPACE
diff --git a/src/charts/areachart/qareaseries.cpp b/src/charts/areachart/qareaseries.cpp
index fd473c72..d7aea781 100644
--- a/src/charts/areachart/qareaseries.cpp
+++ b/src/charts/areachart/qareaseries.cpp
@@ -701,7 +701,7 @@ void QAreaSeriesPrivate::initializeDomain()
     QLineSeries *lowerSeries = q->lowerSeries();
 
     if (upperSeries) {
-        const QVector<QPointF> &points = upperSeries->pointsVector();
+        const auto &points = upperSeries->points();
 
         if (!points.isEmpty()) {
             minX = points[0].x();
@@ -720,7 +720,7 @@ void QAreaSeriesPrivate::initializeDomain()
         }
     }
     if (lowerSeries) {
-        const QVector<QPointF> &points = lowerSeries->pointsVector();
+        const auto &points = lowerSeries->points();
 
         if (!points.isEmpty()) {
             if (!upperSeries) {
diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp
index 26a159b4..65709753 100644
--- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp
+++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp
@@ -48,9 +48,9 @@ ChartBarCategoryAxisX::~ChartBarCategoryAxisX()
 {
 }
 
-QVector<qreal> ChartBarCategoryAxisX::calculateLayout() const
+QList<qreal> ChartBarCategoryAxisX::calculateLayout() const
 {
-    QVector<qreal> points;
+    QList<qreal> points;
     const QRectF& gridRect = gridGeometry();
     qreal range = max() - min();
     const qreal delta = gridRect.width() / range;
@@ -73,11 +73,11 @@ QVector<qreal> ChartBarCategoryAxisX::calculateLayout() const
     return points;
 }
 
-QStringList ChartBarCategoryAxisX::createCategoryLabels(const QVector<qreal>& layout) const
+QStringList ChartBarCategoryAxisX::createCategoryLabels(const QList<qreal> &layout) const
 {
     QStringList result ;
     const QRectF &gridRect = gridGeometry();
-    qreal d = (max() - min()) / gridRect.width();
+    const qreal d = (max() - min()) / gridRect.width();
 
     for (int i = 0; i < layout.count() - 1; ++i) {
         int x = qFloor((((layout[i] + layout[i + 1]) / 2 - gridRect.left()) * d + min() + 0.5));
@@ -95,7 +95,7 @@ QStringList ChartBarCategoryAxisX::createCategoryLabels(const QVector<qreal>& la
 
 void ChartBarCategoryAxisX::updateGeometry()
 {
-    const QVector<qreal>& layout = ChartAxisElement::layout();
+    const QList<qreal> &layout = ChartAxisElement::layout();
     if (layout.isEmpty())
         return;
     setLabels(createCategoryLabels(layout));
diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h
index 0dfc3926..a01fa871 100644
--- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h
+++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h
@@ -56,10 +56,10 @@ public:
 
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override;
 protected:
-    QVector<qreal> calculateLayout() const override;
+    QList<qreal> calculateLayout() const override;
     void updateGeometry() override;
 private:
-    QStringList createCategoryLabels(const QVector<qreal>& layout) const;
+    QStringList createCategoryLabels(const QList<qreal> &layout) const;
 public Q_SLOTS:
     void handleCategoriesChanged();
 
diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp
index a8ef0aa5..65b84d43 100644
--- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp
+++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp
@@ -48,18 +48,18 @@ ChartBarCategoryAxisY::~ChartBarCategoryAxisY()
 {
 }
 
-QVector<qreal> ChartBarCategoryAxisY::calculateLayout() const
+QList<qreal> ChartBarCategoryAxisY::calculateLayout() const
 {
-    QVector<qreal> points;
+    QList<qreal> points;
     const QRectF& gridRect = gridGeometry();
-    qreal range = max() - min();
+    const qreal range = max() - min();
     const qreal delta = gridRect.height() / range;
 
     if (delta < 2)
         return points;
 
-    qreal adjustedMin = min() + 0.5;
-    qreal offset = (qRound(adjustedMin) - adjustedMin) * delta;
+    const qreal adjustedMin = min() + 0.5;
+    const qreal offset = (qRound(adjustedMin) - adjustedMin) * delta;
 
     int count = qFloor(range);
     if (count < 1)
@@ -73,11 +73,11 @@ QVector<qreal> ChartBarCategoryAxisY::calculateLayout() const
     return points;
 }
 
-QStringList ChartBarCategoryAxisY::createCategoryLabels(const QVector<qreal>& layout) const
+QStringList ChartBarCategoryAxisY::createCategoryLabels(const QList<qreal> &layout) const
 {
     QStringList result;
     const QRectF &gridRect = gridGeometry();
-    qreal d = (max() - min()) / gridRect.height();
+    const qreal d = (max() - min()) / gridRect.height();
 
     for (int i = 0; i < layout.count() - 1; ++i) {
         int x = qFloor(((gridRect.height() - (layout[i + 1] + layout[i]) / 2 + gridRect.top()) * d + min() + 0.5));
@@ -94,7 +94,7 @@ QStringList ChartBarCategoryAxisY::createCategoryLabels(const QVector<qreal>& la
 
 void ChartBarCategoryAxisY::updateGeometry()
 {
-    const QVector<qreal>& layout = ChartAxisElement::layout();
+    const QList<qreal> &layout = ChartAxisElement::layout();
     if (layout.isEmpty())
         return;
     setLabels(createCategoryLabels(layout));
diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h
index 3f4b0966..dddb1eef 100644
--- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h
+++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h
@@ -56,10 +56,10 @@ public:
 
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override;
 protected:
-    QVector<qreal> calculateLayout() const override;
+    QList<qreal> calculateLayout() const override;
     void updateGeometry() override;
 private:
-    QStringList createCategoryLabels(const QVector<qreal>& layout) const;
+    QStringList createCategoryLabels(const QList<qreal> &layout) const;
 public Q_SLOTS:
     void handleCategoriesChanged();
 private:
diff --git a/src/charts/axis/cartesianchartaxis.cpp b/src/charts/axis/cartesianchartaxis.cpp
index 935a9601..99e8f9ae 100644
--- a/src/charts/axis/cartesianchartaxis.cpp
+++ b/src/charts/axis/cartesianchartaxis.cpp
@@ -149,7 +149,7 @@ void CartesianChartAxis::updateMinorTickItems()
                 minorCounter++;
             }
 
-            QVector<qreal> points;
+            QList<qreal> points;
 
             // Calculate the points on axis value space. Conversion to graphical points
             // will be done on axis specific geometry update function
@@ -220,7 +220,7 @@ void CartesianChartAxis::deleteItems(int count)
     }
 }
 
-void CartesianChartAxis::updateLayout(QVector<qreal> &layout)
+void CartesianChartAxis::updateLayout(const QList<qreal> &layout)
 {
     int diff = ChartAxisElement::layout().size() - layout.size();
 
@@ -278,7 +278,7 @@ void CartesianChartAxis::setGeometry(const QRectF &axis, const QRectF &grid)
         return;
     }
 
-    QVector<qreal> layout = calculateLayout();
+    const QList<qreal> layout = calculateLayout();
     updateLayout(layout);
 }
 
@@ -359,7 +359,7 @@ void CartesianChartAxis::handleShadesPenChanged(const QPen &pen)
 
 void CartesianChartAxis::updateLabelsValues(QValueAxis *axis)
 {
-    const QVector<qreal> &layout = ChartAxisElement::layout();
+    const QList<qreal> &layout = ChartAxisElement::layout();
     if (layout.isEmpty())
         return;
 
diff --git a/src/charts/axis/cartesianchartaxis_p.h b/src/charts/axis/cartesianchartaxis_p.h
index 6e9d59bf..a0c04979 100644
--- a/src/charts/axis/cartesianchartaxis_p.h
+++ b/src/charts/axis/cartesianchartaxis_p.h
@@ -67,7 +67,7 @@ public:
 protected:
     void setGeometry(const QRectF &size) override { Q_UNUSED(size);}
     void updateGeometry() override = 0;
-    void updateLayout(QVector<qreal> &layout) override;
+    void updateLayout(const QList<qreal> &layout) override;
 
 public Q_SLOTS:
     void handleArrowPenChanged(const QPen &pen) override;
diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp b/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp
index 56f85e58..a033dc0b 100644
--- a/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp
+++ b/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp
@@ -48,10 +48,10 @@ ChartCategoryAxisX::~ChartCategoryAxisX()
 {
 }
 
-QVector<qreal> ChartCategoryAxisX::calculateLayout() const
+QList<qreal> ChartCategoryAxisX::calculateLayout() const
 {
     int tickCount = m_axis->categoriesLabels().count() + 1;
-    QVector<qreal> points;
+    QList<qreal> points;
 
     if (tickCount < 2)
         return points;
diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h b/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h
index 547d9a63..9431a2c8 100644
--- a/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h
+++ b/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h
@@ -59,7 +59,7 @@ public Q_SLOTS:
     void handleCategoriesChanged();
 
 protected:
-    QVector<qreal> calculateLayout() const override;
+    QList<qreal> calculateLayout() const override;
     void updateGeometry() override;
 
 private:
diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp b/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp
index a80355f4..7d6d80aa 100644
--- a/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp
+++ b/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp
@@ -49,10 +49,10 @@ ChartCategoryAxisY::~ChartCategoryAxisY()
 {
 }
 
-QVector<qreal> ChartCategoryAxisY::calculateLayout() const
+QList<qreal> ChartCategoryAxisY::calculateLayout() const
 {
     int tickCount = m_axis->categoriesLabels().count() + 1;
-    QVector<qreal> points;
+    QList<qreal> points;
 
     if (tickCount < 2)
         return points;
diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h b/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h
index 736dfb60..8b00d901 100644
--- a/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h
+++ b/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h
@@ -59,7 +59,7 @@ public Q_SLOTS:
     void handleCategoriesChanged();
 
 protected:
-    QVector<qreal> calculateLayout() const override;
+    QList<qreal> calculateLayout() const override;
     void updateGeometry() override;
 
 private:
diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp
index 890f0089..04211902 100644
--- a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp
+++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp
@@ -45,11 +45,11 @@ PolarChartCategoryAxisAngular::~PolarChartCategoryAxisAngular()
 {
 }
 
-QVector<qreal> PolarChartCategoryAxisAngular::calculateLayout() const
+QList<qreal> PolarChartCategoryAxisAngular::calculateLayout() const
 {
     QCategoryAxis *catAxis = static_cast<QCategoryAxis *>(axis());
     int tickCount = catAxis->categoriesLabels().count() + 1;
-    QVector<qreal> points;
+    QList<qreal> points;
 
     if (tickCount < 2)
         return points;
@@ -71,7 +71,7 @@ QVector<qreal> PolarChartCategoryAxisAngular::calculateLayout() const
     return points;
 }
 
-void PolarChartCategoryAxisAngular::createAxisLabels(const QVector<qreal> &layout)
+void PolarChartCategoryAxisAngular::createAxisLabels(const QList<qreal> &layout)
 {
     Q_UNUSED(layout);
     setLabels(static_cast<QCategoryAxis *>(axis())->categoriesLabels() << QString());
diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h
index ff03a9cc..cbcc2cb3 100644
--- a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h
+++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h
@@ -54,8 +54,8 @@ public:
     PolarChartCategoryAxisAngular(QCategoryAxis *axis, QGraphicsItem *item);
     ~PolarChartCategoryAxisAngular();
 
-    QVector<qreal> calculateLayout() const override;
-    void createAxisLabels(const QVector<qreal> &layout) override;
+    virtual QList<qreal> calculateLayout() const override;
+    virtual void createAxisLabels(const QList<qreal> &layout) override;
 
 public Q_SLOTS:
     void handleCategoriesChanged();
diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp
index 75766aa3..e47e0933 100644
--- a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp
+++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp
@@ -45,11 +45,11 @@ PolarChartCategoryAxisRadial::~PolarChartCategoryAxisRadial()
 {
 }
 
-QVector<qreal> PolarChartCategoryAxisRadial::calculateLayout() const
+QList<qreal> PolarChartCategoryAxisRadial::calculateLayout() const
 {
     QCategoryAxis *catAxis = static_cast<QCategoryAxis *>(axis());
     int tickCount = catAxis->categoriesLabels().count() + 1;
-    QVector<qreal> points;
+    QList<qreal> points;
 
     if (tickCount < 2)
         return points;
@@ -71,7 +71,7 @@ QVector<qreal> PolarChartCategoryAxisRadial::calculateLayout() const
     return points;
 }
 
-void PolarChartCategoryAxisRadial::createAxisLabels(const QVector<qreal> &layout)
+void PolarChartCategoryAxisRadial::createAxisLabels(const QList<qreal> &layout)
 {
     Q_UNUSED(layout);
     setLabels(static_cast<QCategoryAxis *>(axis())->categoriesLabels() << QString());
diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h
index 3a5a913f..231d4599 100644
--- a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h
+++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h
@@ -54,8 +54,8 @@ public:
     PolarChartCategoryAxisRadial(QCategoryAxis *axis, QGraphicsItem *item);
     ~PolarChartCategoryAxisRadial();
 
-    QVector<qreal> calculateLayout() const override;
-    void createAxisLabels(const QVector<qreal> &layout) override;
+    virtual QList<qreal> calculateLayout() const override;
+    virtual void createAxisLabels(const QList<qreal> &layout) override;
 
 public Q_SLOTS:
     void handleCategoriesChanged();
diff --git a/src/charts/axis/chartaxiselement.cpp b/src/charts/axis/chartaxiselement.cpp
index 8db5ef36..7526d2e3 100644
--- a/src/charts/axis/chartaxiselement.cpp
+++ b/src/charts/axis/chartaxiselement.cpp
@@ -312,7 +312,7 @@ void ChartAxisElement::handleRangeChanged(qreal min, qreal max)
     Q_UNUSED(max);
 
     if (!isEmpty()) {
-        QVector<qreal> layout = calculateLayout();
+        const QList<qreal> layout = calculateLayout();
         updateLayout(layout);
         QSizeF before = effectiveSizeHint(Qt::PreferredSize);
         QSizeF after = sizeHint(Qt::PreferredSize);
diff --git a/src/charts/axis/chartaxiselement_p.h b/src/charts/axis/chartaxiselement_p.h
index c32896c4..92babf31 100644
--- a/src/charts/axis/chartaxiselement_p.h
+++ b/src/charts/axis/chartaxiselement_p.h
@@ -73,10 +73,16 @@ public:
     AxisAnimation *animation() const override { return m_animation; }
 
     QAbstractAxis *axis() const { return m_axis; }
-    void setLayout(QVector<qreal> &layout) { m_layout = layout; }
-    QVector<qreal> &layout() { return m_layout; } // Modifiable reference
-    void setDynamicMinorTickLayout(const QVector<qreal> &layout) { m_dynamicMinorTickLayout = layout; }
-    QVector<qreal> &dynamicMinorTicklayout() { return m_dynamicMinorTickLayout; } // Modifiable reference
+    void setLayout(const QList<qreal> &layout) { m_layout = layout; }
+    QList<qreal> &layout() { return m_layout; } // Modifiable reference
+    void setDynamicMinorTickLayout(const QList<qreal> &layout)
+    {
+        m_dynamicMinorTickLayout = layout;
+    }
+    QList<qreal> &dynamicMinorTicklayout()
+    {
+        return m_dynamicMinorTickLayout;
+    } // Modifiable reference
     inline qreal labelPadding() const { return qreal(4.0); }
     inline qreal titlePadding() const { return qreal(2.0); }
     void setLabels(const QStringList &labels) { m_labelsList = labels; }
@@ -118,8 +124,8 @@ public:
     void setLabelsEditable(bool labelsEditable);
 
 protected:
-    virtual QVector<qreal> calculateLayout() const = 0;
-    virtual void updateLayout(QVector<qreal> &layout) = 0;
+    virtual QList<qreal> calculateLayout() const = 0;
+    virtual void updateLayout(const QList<qreal> &layout) = 0;
 
     QList<QGraphicsItem *> gridItems() { return m_grid->childItems(); }
     QList<QGraphicsItem *> minorGridItems() { return m_minorGrid->childItems(); }
@@ -175,8 +181,8 @@ private:
 
     QAbstractAxis *m_axis;
     AxisAnimation *m_animation;
-    QVector<qreal> m_layout;
-    QVector<qreal> m_dynamicMinorTickLayout;
+    QList<qreal> m_layout;
+    QList<qreal> m_dynamicMinorTickLayout;
     QStringList m_labelsList;
     QRectF m_axisRect;
     QScopedPointer<QGraphicsItemGroup> m_grid;
diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp b/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp
index 7b304b6c..5abea37a 100644
--- a/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp
+++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp
@@ -49,13 +49,13 @@ ChartDateTimeAxisX::~ChartDateTimeAxisX()
 {
 }
 
-QVector<qreal> ChartDateTimeAxisX::calculateLayout() const
+QList<qreal> ChartDateTimeAxisX::calculateLayout() const
 {
     int tickCount = m_axis->tickCount();
 
     Q_ASSERT(tickCount >= 2);
 
-    QVector<qreal> points;
+    QList<qreal> points;
     points.resize(tickCount);
     const QRectF &gridRect = gridGeometry();
     const qreal deltaX = gridRect.width() / (qreal(tickCount) - 1.0);
@@ -66,7 +66,7 @@ QVector<qreal> ChartDateTimeAxisX::calculateLayout() const
 
 void ChartDateTimeAxisX::updateGeometry()
 {
-    const QVector<qreal>& layout = ChartAxisElement::layout();
+    const QList<qreal> &layout = ChartAxisElement::layout();
     if (layout.isEmpty())
         return;
     setLabels(createDateTimeLabels(min(), max(), layout.size(), m_axis->format()));
diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h b/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h
index 7f1e1417..913bf0a2 100644
--- a/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h
+++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h
@@ -55,7 +55,7 @@ public:
 
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override;
 protected:
-    QVector<qreal> calculateLayout() const override;
+    QList<qreal> calculateLayout() const override;
     void updateGeometry() override;
 private Q_SLOTS:
     void handleTickCountChanged(int tick);
diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp b/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp
index 9f3a9eb3..4bd2588a 100644
--- a/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp
+++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp
@@ -49,13 +49,13 @@ ChartDateTimeAxisY::~ChartDateTimeAxisY()
 {
 }
 
-QVector<qreal> ChartDateTimeAxisY::calculateLayout() const
+QList<qreal> ChartDateTimeAxisY::calculateLayout() const
 {
-    int tickCount = m_axis->tickCount();
+    const int tickCount = m_axis->tickCount();
 
     Q_ASSERT(tickCount >= 2);
 
-    QVector<qreal> points;
+    QList<qreal> points;
     points.resize(tickCount);
     const QRectF &gridRect = gridGeometry();
     const qreal deltaY = gridRect.height() / (qreal(tickCount) - 1.0);
@@ -67,7 +67,7 @@ QVector<qreal> ChartDateTimeAxisY::calculateLayout() const
 
 void ChartDateTimeAxisY::updateGeometry()
 {
-    const QVector<qreal> &layout = ChartAxisElement::layout();
+    const QList<qreal> &layout = ChartAxisElement::layout();
     if (layout.isEmpty())
         return;
     setLabels(createDateTimeLabels(min(), max(), layout.size(), m_axis->format()));
diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h b/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h
index 29b5d0c1..cad1560f 100644
--- a/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h
+++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h
@@ -55,7 +55,7 @@ public:
 
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override;
 protected:
-    QVector<qreal> calculateLayout() const override;
+    QList<qreal> calculateLayout() const override;
     void updateGeometry() override;
 private Q_SLOTS:
     void handleTickCountChanged(int tick);
diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp
index 78f1de94..f4747b02 100644
--- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp
+++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp
@@ -45,12 +45,12 @@ PolarChartDateTimeAxisAngular::~PolarChartDateTimeAxisAngular()
 {
 }
 
-QVector<qreal> PolarChartDateTimeAxisAngular::calculateLayout() const
+QList<qreal> PolarChartDateTimeAxisAngular::calculateLayout() const
 {
     int tickCount = static_cast<QDateTimeAxis *>(axis())->tickCount();
     Q_ASSERT(tickCount >= 2);
 
-    QVector<qreal> points;
+    QList<qreal> points;
     points.resize(tickCount);
 
     const qreal d = 360.0 / qreal(tickCount - 1);
@@ -62,7 +62,7 @@ QVector<qreal> PolarChartDateTimeAxisAngular::calculateLayout() const
 
     return points;
 }
-void PolarChartDateTimeAxisAngular::createAxisLabels(const QVector<qreal> &layout)
+void PolarChartDateTimeAxisAngular::createAxisLabels(const QList<qreal> &layout)
 {
     QStringList labelList = createDateTimeLabels(min(), max(), layout.size(), static_cast<QDateTimeAxis *>(axis())->format());
     setLabels(labelList);
diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h
index a0311b6f..76348f41 100644
--- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h
+++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h
@@ -53,8 +53,8 @@ public:
     PolarChartDateTimeAxisAngular(QDateTimeAxis *axis, QGraphicsItem *item);
     ~PolarChartDateTimeAxisAngular();
 
-    QVector<qreal> calculateLayout() const override;
-    void createAxisLabels(const QVector<qreal> &layout) override;
+    QList<qreal> calculateLayout() const override;
+    void createAxisLabels(const QList<qreal> &layout) override;
 
 private Q_SLOTS:
     void handleTickCountChanged(int tick);
diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp
index 7a787b7c..442583f3 100644
--- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp
+++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp
@@ -45,12 +45,12 @@ PolarChartDateTimeAxisRadial::~PolarChartDateTimeAxisRadial()
 {
 }
 
-QVector<qreal> PolarChartDateTimeAxisRadial::calculateLayout() const
+QList<qreal> PolarChartDateTimeAxisRadial::calculateLayout() const
 {
     int tickCount = static_cast<QDateTimeAxis *>(axis())->tickCount();
     Q_ASSERT(tickCount >= 2);
 
-    QVector<qreal> points;
+    QList<qreal> points;
     points.resize(tickCount);
 
     const qreal d = (axisGeometry().width() / 2) / qreal(tickCount - 1);
@@ -62,7 +62,7 @@ QVector<qreal> PolarChartDateTimeAxisRadial::calculateLayout() const
 
     return points;
 }
-void PolarChartDateTimeAxisRadial::createAxisLabels(const QVector<qreal> &layout)
+void PolarChartDateTimeAxisRadial::createAxisLabels(const QList<qreal> &layout)
 {
     setLabels(createDateTimeLabels(min(), max(), layout.size(), static_cast<QDateTimeAxis *>(axis())->format()));
 }
diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h
index b4ccc373..c6a3a143 100644
--- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h
+++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h
@@ -53,8 +53,8 @@ public:
     PolarChartDateTimeAxisRadial(QDateTimeAxis *axis, QGraphicsItem *item);
     ~PolarChartDateTimeAxisRadial();
 
-    QVector<qreal> calculateLayout() const override;
-    void createAxisLabels(const QVector<qreal> &layout) override;
+    QList<qreal> calculateLayout() const override;
+    void createAxisLabels(const QList<qreal> &layout) override;
 
 private Q_SLOTS:
     void handleTickCountChanged(int tick);
diff --git a/src/charts/axis/horizontalaxis.cpp b/src/charts/axis/horizontalaxis.cpp
index 3bbc5ebe..6e29f318 100644
--- a/src/charts/axis/horizontalaxis.cpp
+++ b/src/charts/axis/horizontalaxis.cpp
@@ -74,8 +74,8 @@ QSizeF HorizontalAxis::sizeHint(Qt::SizeHint which, const QSizeF &constraint) co
 
 void HorizontalAxis::updateGeometry()
 {
-    const QVector<qreal> &layout = ChartAxisElement::layout();
-    const QVector<qreal> &dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout();
+    const QList<qreal> &layout = ChartAxisElement::layout();
+    const QList<qreal> &dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout();
 
     if (layout.isEmpty() && dynamicMinorTicklayout.isEmpty()
             && axis()->type() != QAbstractAxis::AxisTypeLogValue) {
@@ -336,10 +336,10 @@ void HorizontalAxis::updateMinorTickGeometry()
     if (!axis())
         return;
 
-    QVector<qreal> layout = ChartAxisElement::layout();
+    QList<qreal> layout = ChartAxisElement::layout();
     int minorTickCount = 0;
     qreal tickSpacing = 0.0;
-    QVector<qreal> minorTickSpacings;
+    QList<qreal> minorTickSpacings;
     switch (axis()->type()) {
     case QAbstractAxis::AxisTypeValue: {
         const QValueAxis *valueAxis = qobject_cast<QValueAxis *>(axis());
@@ -409,7 +409,7 @@ void HorizontalAxis::updateMinorTickGeometry()
 
     const QValueAxis *valueAxis = qobject_cast<QValueAxis *>(axis());
     if (valueAxis && valueAxis->tickType() == QValueAxis::TicksDynamic) {
-        const QVector<qreal> dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout();
+        const QList<qreal> dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout();
         const QRectF &gridRect = gridGeometry();
         const qreal deltaX = gridRect.width() / (valueAxis->max() - valueAxis->min());
         const qreal leftPos = gridRect.left();
diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp b/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp
index d600696e..e6330305 100644
--- a/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp
+++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp
@@ -48,9 +48,9 @@ ChartLogValueAxisX::~ChartLogValueAxisX()
 {
 }
 
-QVector<qreal> ChartLogValueAxisX::calculateLayout() const
+QList<qreal> ChartLogValueAxisX::calculateLayout() const
 {
-    QVector<qreal> points;
+    QList<qreal> points;
     points.resize(m_axis->tickCount());
 
     const qreal logMax = std::log10(m_axis->max()) / std::log10(m_axis->base());
@@ -68,7 +68,7 @@ QVector<qreal> ChartLogValueAxisX::calculateLayout() const
 
 void ChartLogValueAxisX::updateGeometry()
 {
-    const QVector<qreal>& layout = ChartAxisElement::layout();
+    const QList<qreal> &layout = ChartAxisElement::layout();
     setLabels(createLogValueLabels(m_axis->min(), m_axis->max(), m_axis->base(), layout.size(), m_axis->labelFormat()));
     HorizontalAxis::updateGeometry();
 }
diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h b/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h
index 74bf83a4..4de84904 100644
--- a/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h
+++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h
@@ -57,7 +57,7 @@ public:
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override;
 
 protected:
-    QVector<qreal> calculateLayout() const override;
+    QList<qreal> calculateLayout() const override;
     void updateGeometry() override;
 
 private Q_SLOTS:
diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp b/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp
index f1adb348..48d79368 100644
--- a/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp
+++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp
@@ -48,9 +48,9 @@ ChartLogValueAxisY::~ChartLogValueAxisY()
 {
 }
 
-QVector<qreal> ChartLogValueAxisY::calculateLayout() const
+QList<qreal> ChartLogValueAxisY::calculateLayout() const
 {
-    QVector<qreal> points;
+    QList<qreal> points;
     points.resize(m_axis->tickCount());
 
     const qreal logMax = std::log10(m_axis->max()) / std::log10(m_axis->base());
@@ -69,7 +69,7 @@ QVector<qreal> ChartLogValueAxisY::calculateLayout() const
 
 void ChartLogValueAxisY::updateGeometry()
 {
-    const QVector<qreal> &layout = ChartAxisElement::layout();
+    const QList<qreal> &layout = ChartAxisElement::layout();
     setLabels(createLogValueLabels(m_axis->min(), m_axis->max(), m_axis->base(), layout.size(), m_axis->labelFormat()));
     VerticalAxis::updateGeometry();
 }
diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h b/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h
index 5a584ee4..6a66a23f 100644
--- a/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h
+++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h
@@ -57,7 +57,7 @@ public:
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override;
 
 protected:
-    QVector<qreal> calculateLayout() const override;
+    QList<qreal> calculateLayout() const override;
     void updateGeometry() override;
 
 private Q_SLOTS:
diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp
index b29136be..e9397bc7 100644
--- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp
+++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp
@@ -48,11 +48,11 @@ PolarChartLogValueAxisAngular::~PolarChartLogValueAxisAngular()
 {
 }
 
-QVector<qreal> PolarChartLogValueAxisAngular::calculateLayout() const
+QList<qreal> PolarChartLogValueAxisAngular::calculateLayout() const
 {
     QLogValueAxis *logValueAxis = qobject_cast<QLogValueAxis *>(axis());
 
-    QVector<qreal> points;
+    QList<qreal> points;
     points.resize(logValueAxis->tickCount());
 
     const qreal logMax = std::log10(logValueAxis->max()) / std::log10(logValueAxis->base());
@@ -67,7 +67,7 @@ QVector<qreal> PolarChartLogValueAxisAngular::calculateLayout() const
     return points;
 }
 
-void PolarChartLogValueAxisAngular::createAxisLabels(const QVector<qreal> &layout)
+void PolarChartLogValueAxisAngular::createAxisLabels(const QList<qreal> &layout)
 {
     QLogValueAxis *logValueAxis = static_cast<QLogValueAxis *>(axis());
     setLabels(createLogValueLabels(logValueAxis->min(),
diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h
index 591038d4..215f07f7 100644
--- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h
+++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h
@@ -54,8 +54,8 @@ public:
     ~PolarChartLogValueAxisAngular();
 
 protected:
-    QVector<qreal> calculateLayout() const override;
-    void createAxisLabels(const QVector<qreal> &layout) override;
+    QList<qreal> calculateLayout() const override;
+    void createAxisLabels(const QList<qreal> &layout) override;
 
 private Q_SLOTS:
     void handleBaseChanged(qreal base);
diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp
index 1df14ce7..4f5037cd 100644
--- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp
+++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp
@@ -47,11 +47,11 @@ PolarChartLogValueAxisRadial::~PolarChartLogValueAxisRadial()
 {
 }
 
-QVector<qreal> PolarChartLogValueAxisRadial::calculateLayout() const
+QList<qreal> PolarChartLogValueAxisRadial::calculateLayout() const
 {
     QLogValueAxis *logValueAxis = qobject_cast<QLogValueAxis *>(axis());
 
-    QVector<qreal> points;
+    QList<qreal> points;
     points.resize(logValueAxis->tickCount());
 
     const qreal logMax = std::log10(logValueAxis->max()) / std::log10(logValueAxis->base());
@@ -66,7 +66,7 @@ QVector<qreal> PolarChartLogValueAxisRadial::calculateLayout() const
     return points;
 }
 
-void PolarChartLogValueAxisRadial::createAxisLabels(const QVector<qreal> &layout)
+void PolarChartLogValueAxisRadial::createAxisLabels(const QList<qreal> &layout)
 {
     QLogValueAxis *logValueAxis = static_cast<QLogValueAxis *>(axis());
     setLabels(createLogValueLabels(logValueAxis->min(),
diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h
index d7197577..9ea837b2 100644
--- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h
+++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h
@@ -54,8 +54,8 @@ public:
     ~PolarChartLogValueAxisRadial();
 
 protected:
-    QVector<qreal> calculateLayout() const override;
-    void createAxisLabels(const QVector<qreal> &layout) override;
+    QList<qreal> calculateLayout() const override;
+    void createAxisLabels(const QList<qreal> &layout) override;
 
 private Q_SLOTS:
     void handleBaseChanged(qreal base);
diff --git a/src/charts/axis/polarchartaxis.cpp b/src/charts/axis/polarchartaxis.cpp
index 403d3b09..5d9bd99e 100644
--- a/src/charts/axis/polarchartaxis.cpp
+++ b/src/charts/axis/polarchartaxis.cpp
@@ -54,7 +54,7 @@ void PolarChartAxis::setGeometry(const QRectF &axis, const QRectF &grid)
         return;
     }
 
-    QVector<qreal> layout = calculateLayout();
+    const QList<qreal> layout = calculateLayout();
     updateLayout(layout);
 }
 
@@ -63,7 +63,7 @@ QRectF PolarChartAxis::gridGeometry() const
     return QRectF();
 }
 
-void PolarChartAxis::updateLayout(QVector<qreal> &layout)
+void PolarChartAxis::updateLayout(const QList<qreal> &layout)
 {
     int diff = ChartAxisElement::layout().size() - layout.size();
 
diff --git a/src/charts/axis/polarchartaxis_p.h b/src/charts/axis/polarchartaxis_p.h
index 3f068519..4887887b 100644
--- a/src/charts/axis/polarchartaxis_p.h
+++ b/src/charts/axis/polarchartaxis_p.h
@@ -61,11 +61,11 @@ public: // from ChartAxisElement
     bool isEmpty() override;
 
 protected:
-    void updateLayout(QVector<qreal> &layout) override;
+    void updateLayout(const QList<qreal> &layout) override;
 
 protected: // virtual functions
     virtual void createItems(int count) = 0;
-    virtual void createAxisLabels(const QVector<qreal> &layout) = 0;
+    virtual void createAxisLabels(const QList<qreal> &layout) = 0;
     virtual void updateMinorTickItems() = 0;
 
 public Q_SLOTS:
diff --git a/src/charts/axis/polarchartaxisangular.cpp b/src/charts/axis/polarchartaxisangular.cpp
index bee1baa7..50277ac0 100644
--- a/src/charts/axis/polarchartaxisangular.cpp
+++ b/src/charts/axis/polarchartaxisangular.cpp
@@ -50,7 +50,7 @@ void PolarChartAxisAngular::updateGeometry()
 {
     QGraphicsLayoutItem::updateGeometry();
 
-    const QVector<qreal> &layout = this->layout();
+    const QList<qreal> &layout = this->layout();
     if (layout.isEmpty() && axis()->type() != QAbstractAxis::AxisTypeLogValue)
         return;
 
@@ -371,7 +371,7 @@ qreal PolarChartAxisAngular::preferredAxisRadius(const QSizeF &maxSize)
         radius = maxSize.width() / 2.0;
 
     if (axis()->labelsVisible()) {
-        QVector<qreal> layout = calculateLayout();
+        QList<qreal> layout = calculateLayout();
         if (layout.isEmpty())
             return radius;
 
@@ -489,10 +489,10 @@ void PolarChartAxisAngular::updateMinorTickGeometry()
     if (!axis())
         return;
 
-    QVector<qreal> layout = ChartAxisElement::layout();
+    QList<qreal> layout = ChartAxisElement::layout();
     int minorTickCount = 0;
     qreal tickAngle = 0.0;
-    QVector<qreal> minorTickAngles;
+    QList<qreal> minorTickAngles;
     switch (axis()->type()) {
     case QAbstractAxis::AxisTypeValue: {
         const QValueAxis *valueAxis = qobject_cast<QValueAxis *>(axis());
diff --git a/src/charts/axis/polarchartaxisradial.cpp b/src/charts/axis/polarchartaxisradial.cpp
index 9b303b1f..42ef6b49 100644
--- a/src/charts/axis/polarchartaxisradial.cpp
+++ b/src/charts/axis/polarchartaxisradial.cpp
@@ -49,7 +49,7 @@ PolarChartAxisRadial::~PolarChartAxisRadial()
 
 void PolarChartAxisRadial::updateGeometry()
 {
-    const QVector<qreal> &layout = this->layout();
+    const QList<qreal> &layout = this->layout();
     if (layout.isEmpty() && axis()->type() != QAbstractAxis::AxisTypeLogValue)
         return;
 
@@ -355,10 +355,10 @@ void PolarChartAxisRadial::updateMinorTickGeometry()
     if (!axis())
         return;
 
-    QVector<qreal> layout = ChartAxisElement::layout();
+    QList<qreal> layout = ChartAxisElement::layout();
     int minorTickCount = 0;
     qreal tickRadius = 0.0;
-    QVector<qreal> minorTickRadiuses;
+    QList<qreal> minorTickRadiuses;
     switch (axis()->type()) {
     case QAbstractAxis::AxisTypeValue: {
         const QValueAxis *valueAxis = qobject_cast<QValueAxis *>(axis());
diff --git a/src/charts/axis/valueaxis/chartvalueaxisx.cpp b/src/charts/axis/valueaxis/chartvalueaxisx.cpp
index 3eac86e0..de759e98 100644
--- a/src/charts/axis/valueaxis/chartvalueaxisx.cpp
+++ b/src/charts/axis/valueaxis/chartvalueaxisx.cpp
@@ -58,14 +58,14 @@ ChartValueAxisX::~ChartValueAxisX()
 {
 }
 
-QVector<qreal> ChartValueAxisX::calculateLayout() const
+QList<qreal> ChartValueAxisX::calculateLayout() const
 {
     if (m_axis->tickType() == QValueAxis::TicksFixed) {
         int tickCount = m_axis->tickCount();
 
         Q_ASSERT(tickCount >= 2);
 
-        QVector<qreal> points;
+        QList<qreal> points;
         points.resize(tickCount);
 
         const QRectF &gridRect = gridGeometry();
@@ -88,7 +88,7 @@ QVector<qreal> ChartValueAxisX::calculateLayout() const
         const QRectF &gridRect = gridGeometry();
         const qreal deltaX = gridRect.width() / (maxValue - minValue);
 
-        QVector<qreal> points;
+        QList<qreal> points;
         const qreal leftPos = gridRect.left();
         while (value <= maxValue || qFuzzyCompare(value, maxValue)) {
             points << (value - minValue) * deltaX + leftPos;
@@ -101,8 +101,8 @@ QVector<qreal> ChartValueAxisX::calculateLayout() const
 
 void ChartValueAxisX::updateGeometry()
 {
-    const QVector<qreal>& layout = ChartAxisElement::layout();
-    const QVector<qreal>& dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout();
+    const QList<qreal> &layout = ChartAxisElement::layout();
+    const QList<qreal> &dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout();
     if (layout.isEmpty() && dynamicMinorTicklayout.isEmpty())
         return;
     setLabels(createValueLabels(min(), max(), layout.size(), m_axis->tickInterval(),
diff --git a/src/charts/axis/valueaxis/chartvalueaxisx_p.h b/src/charts/axis/valueaxis/chartvalueaxisx_p.h
index b1b14617..1fb12747 100644
--- a/src/charts/axis/valueaxis/chartvalueaxisx_p.h
+++ b/src/charts/axis/valueaxis/chartvalueaxisx_p.h
@@ -55,7 +55,7 @@ public:
 
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override;
 protected:
-    QVector<qreal> calculateLayout() const override;
+    QList<qreal> calculateLayout() const override;
     void updateGeometry() override;
 private Q_SLOTS:
     void handleTickCountChanged(int tick);
diff --git a/src/charts/axis/valueaxis/chartvalueaxisy.cpp b/src/charts/axis/valueaxis/chartvalueaxisy.cpp
index c4868fc2..6ae70479 100644
--- a/src/charts/axis/valueaxis/chartvalueaxisy.cpp
+++ b/src/charts/axis/valueaxis/chartvalueaxisy.cpp
@@ -57,14 +57,14 @@ ChartValueAxisY::~ChartValueAxisY()
 {
 }
 
-QVector<qreal> ChartValueAxisY::calculateLayout() const
+QList<qreal> ChartValueAxisY::calculateLayout() const
 {
     if (m_axis->tickType() == QValueAxis::TicksFixed) {
         int tickCount = m_axis->tickCount();
 
         Q_ASSERT(tickCount >= 2);
 
-        QVector<qreal> points;
+        QList<qreal> points;
         points.resize(tickCount);
 
         const QRectF &gridRect = gridGeometry();
@@ -89,7 +89,7 @@ QVector<qreal> ChartValueAxisY::calculateLayout() const
         const QRectF &gridRect = gridGeometry();
         const qreal deltaY = gridRect.height() / (maxValue - minValue);
 
-        QVector<qreal> points;
+        QList<qreal> points;
         const qreal bottomPos = gridRect.bottom();
         while (value <= maxValue || qFuzzyCompare(value, maxValue)) {
             points << (value - minValue) * -deltaY + bottomPos;
@@ -102,8 +102,8 @@ QVector<qreal> ChartValueAxisY::calculateLayout() const
 
 void ChartValueAxisY::updateGeometry()
 {
-    const QVector<qreal> &layout = ChartAxisElement::layout();
-    const QVector<qreal>& dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout();
+    const QList<qreal> &layout = ChartAxisElement::layout();
+    const QList<qreal> &dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout();
     if (layout.isEmpty() && dynamicMinorTicklayout.isEmpty())
         return;
     setLabels(createValueLabels(min(), max(), layout.size(), m_axis->tickInterval(),
diff --git a/src/charts/axis/valueaxis/chartvalueaxisy_p.h b/src/charts/axis/valueaxis/chartvalueaxisy_p.h
index 1e2b5c55..52368a81 100644
--- a/src/charts/axis/valueaxis/chartvalueaxisy_p.h
+++ b/src/charts/axis/valueaxis/chartvalueaxisy_p.h
@@ -55,7 +55,7 @@ public:
 
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override;
 protected:
-    QVector<qreal> calculateLayout() const override;
+    QList<qreal> calculateLayout() const override;
     void updateGeometry() override;
 private Q_SLOTS:
     void handleTickCountChanged(int tick);
diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp b/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp
index 88873736..0c071d0e 100644
--- a/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp
+++ b/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp
@@ -46,12 +46,12 @@ PolarChartValueAxisAngular::~PolarChartValueAxisAngular()
 {
 }
 
-QVector<qreal> PolarChartValueAxisAngular::calculateLayout() const
+QList<qreal> PolarChartValueAxisAngular::calculateLayout() const
 {
     int tickCount = static_cast<QValueAxis *>(axis())->tickCount();
     Q_ASSERT(tickCount >= 2);
 
-    QVector<qreal> points;
+    QList<qreal> points;
     points.resize(tickCount);
 
     const qreal d = 360.0 / qreal(tickCount - 1);
@@ -64,7 +64,7 @@ QVector<qreal> PolarChartValueAxisAngular::calculateLayout() const
     return points;
 }
 
-void PolarChartValueAxisAngular::createAxisLabels(const QVector<qreal> &layout)
+void PolarChartValueAxisAngular::createAxisLabels(const QList<qreal> &layout)
 {
     QStringList labelList = createValueLabels(min(), max(), layout.size(), 0.0, 0.0,
                                               QValueAxis::TicksFixed,
diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h b/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h
index 3d658267..49961cc3 100644
--- a/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h
+++ b/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h
@@ -54,8 +54,8 @@ public:
     PolarChartValueAxisAngular(QValueAxis *axis, QGraphicsItem *item);
     ~PolarChartValueAxisAngular();
 
-    QVector<qreal> calculateLayout() const override;
-    void createAxisLabels(const QVector<qreal> &layout) override;
+    QList<qreal> calculateLayout() const override;
+    void createAxisLabels(const QList<qreal> &layout) override;
 
 private Q_SLOTS:
     void handleTickCountChanged(int tick);
diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp b/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp
index f0559d7e..74ee2381 100644
--- a/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp
+++ b/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp
@@ -46,12 +46,12 @@ PolarChartValueAxisRadial::~PolarChartValueAxisRadial()
 {
 }
 
-QVector<qreal> PolarChartValueAxisRadial::calculateLayout() const
+QList<qreal> PolarChartValueAxisRadial::calculateLayout() const
 {
     int tickCount = static_cast<QValueAxis *>(axis())->tickCount();
     Q_ASSERT(tickCount >= 2);
 
-    QVector<qreal> points;
+    QList<qreal> points;
     points.resize(tickCount);
 
     const qreal d = (axisGeometry().width() / 2) / qreal(tickCount - 1);
@@ -64,7 +64,7 @@ QVector<qreal> PolarChartValueAxisRadial::calculateLayout() const
     return points;
 }
 
-void PolarChartValueAxisRadial::createAxisLabels(const QVector<qreal> &layout)
+void PolarChartValueAxisRadial::createAxisLabels(const QList<qreal> &layout)
 {
     setLabels(createValueLabels(min(), max(), layout.size(), 0.0, 0.0,
                                 QValueAxis::TicksFixed,
diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h b/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h
index a60c3ae7..d3ff2dfc 100644
--- a/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h
+++ b/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h
@@ -53,8 +53,8 @@ public:
     PolarChartValueAxisRadial(QValueAxis *axis, QGraphicsItem *item);
     ~PolarChartValueAxisRadial();
 
-    QVector<qreal> calculateLayout() const override;
-    void createAxisLabels(const QVector<qreal> &layout) override;
+    QList<qreal> calculateLayout() const override;
+    void createAxisLabels(const QList<qreal> &layout) override;
 
 private Q_SLOTS:
     void handleTickCountChanged(int tick);
diff --git a/src/charts/axis/verticalaxis.cpp b/src/charts/axis/verticalaxis.cpp
index 6282f297..45a9f589 100644
--- a/src/charts/axis/verticalaxis.cpp
+++ b/src/charts/axis/verticalaxis.cpp
@@ -74,8 +74,8 @@ QSizeF VerticalAxis::sizeHint(Qt::SizeHint which, const QSizeF &constraint) cons
 
 void VerticalAxis::updateGeometry()
 {
-    const QVector<qreal> &layout = ChartAxisElement::layout();
-    const QVector<qreal> &dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout();
+    const QList<qreal> &layout = ChartAxisElement::layout();
+    const QList<qreal> &dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout();
 
     if (layout.isEmpty() && dynamicMinorTicklayout.isEmpty()
             && axis()->type() != QAbstractAxis::AxisTypeLogValue) {
@@ -354,10 +354,10 @@ void VerticalAxis::updateMinorTickGeometry()
     if (!axis())
         return;
 
-    QVector<qreal> layout = ChartAxisElement::layout();
+    QList<qreal> layout = ChartAxisElement::layout();
     int minorTickCount = 0;
     qreal tickSpacing = 0.0;
-    QVector<qreal> minorTickSpacings;
+    QList<qreal> minorTickSpacings;
     switch (axis()->type()) {
     case QAbstractAxis::AxisTypeValue: {
         const QValueAxis *valueAxis = qobject_cast<QValueAxis *>(axis());
@@ -427,7 +427,7 @@ void VerticalAxis::updateMinorTickGeometry()
 
     const QValueAxis *valueAxis = qobject_cast<QValueAxis *>(axis());
     if (valueAxis && valueAxis->tickType() == QValueAxis::TicksDynamic) {
-        const QVector<qreal> dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout();
+        const QList<qreal> dynamicMinorTicklayout = ChartAxisElement::dynamicMinorTicklayout();
         const QRectF &gridRect = gridGeometry();
         const qreal deltaY = gridRect.height() / (valueAxis->max() - valueAxis->min());
         const qreal bottomPos = gridRect.bottom();
diff --git a/src/charts/barchart/abstractbarchartitem.cpp b/src/charts/barchart/abstractbarchartitem.cpp
index 9695a60e..2c5c24eb 100644
--- a/src/charts/barchart/abstractbarchartitem.cpp
+++ b/src/charts/barchart/abstractbarchartitem.cpp
@@ -120,7 +120,7 @@ void AbstractBarChartItem::initializeFullLayout()
     }
 }
 
-void AbstractBarChartItem::applyLayout(const QVector<QRectF> &layout)
+void AbstractBarChartItem::applyLayout(const QList<QRectF> &layout)
 {
     QSizeF size = geometry().size();
     if (geometry().size().isValid()) {
@@ -152,7 +152,7 @@ void AbstractBarChartItem::setAnimation(BarAnimation *animation)
     m_resetAnimation = true;
 }
 
-void AbstractBarChartItem::setLayout(const QVector<QRectF> &layout)
+void AbstractBarChartItem::setLayout(const QList<QRectF> &layout)
 {
     int setCount = m_series->count();
     if (layout.size() != m_layout.size() || m_barMap.size() != setCount)
@@ -199,7 +199,7 @@ void AbstractBarChartItem::handleLayoutChanged()
     if ((m_rect.width() <= 0) || (m_rect.height() <= 0))
         return; // rect size zero.
     updateBarItems();
-    QVector<QRectF> layout = calculateLayout();
+    QList<QRectF> layout = calculateLayout();
     handleUpdatedBars();
     applyLayout(layout);
 }
@@ -597,7 +597,7 @@ void AbstractBarChartItem::updateBarItems()
 
     int layoutSize = m_categoryCount * newSets.size();
 
-    QVector<QRectF> oldLayout = m_layout;
+    QList<QRectF> oldLayout = m_layout;
     if (layoutSize != m_layout.size())
         m_layout.resize(layoutSize);
 
@@ -628,7 +628,7 @@ void AbstractBarChartItem::updateBarItems()
         }
         // Update bar indexes
         QHash<int, Bar*> indexMap;
-        QVector<Bar *> unassignedBars(m_categoryCount, nullptr);
+        QList<Bar *> unassignedBars(m_categoryCount, nullptr);
         int unassignedIndex(0);
         QList<Bar *> newBars;
         newBars.reserve(m_categoryCount);
diff --git a/src/charts/barchart/abstractbarchartitem_p.h b/src/charts/barchart/abstractbarchartitem_p.h
index 72f3ad5b..2155845e 100644
--- a/src/charts/barchart/abstractbarchartitem_p.h
+++ b/src/charts/barchart/abstractbarchartitem_p.h
@@ -66,13 +66,13 @@ public:
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
     QRectF boundingRect() const override;
 
-    virtual QVector<QRectF> calculateLayout() = 0;
+    virtual QList<QRectF> calculateLayout() = 0;
     void initializeFullLayout();
     virtual void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) = 0;
-    virtual void applyLayout(const QVector<QRectF> &layout);
+    virtual void applyLayout(const QList<QRectF> &layout);
     virtual void setAnimation(BarAnimation *animation);
     ChartAnimation *animation() const override;
-    void setLayout(const QVector<QRectF> &layout);
+    void setLayout(const QList<QRectF> &layout);
     QRectF geometry() const { return m_rect;}
     void resetAnimation();
 
@@ -102,7 +102,7 @@ protected:
     void calculateSeriesPositionAdjustmentAndWidth();
 
     QRectF m_rect;
-    QVector<QRectF> m_layout;
+    QList<QRectF> m_layout;
 
     BarAnimation *m_animation;
 
diff --git a/src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp b/src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp
index 6e42385d..16601ed5 100644
--- a/src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp
+++ b/src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp
@@ -93,9 +93,9 @@ QPointF HorizontalBarChartItem::bottomRightPoint(int set, int setCount, int cate
                 m_validData);
 }
 
-QVector<QRectF> HorizontalBarChartItem::calculateLayout()
+QList<QRectF> HorizontalBarChartItem::calculateLayout()
 {
-    QVector<QRectF> layout;
+    QList<QRectF> layout;
     layout.resize(m_layout.size());
 
     const int setCount = m_series->count();
diff --git a/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h b/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h
index 9e303440..47ea74e7 100644
--- a/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h
+++ b/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h
@@ -52,7 +52,7 @@ public:
     HorizontalBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0);
 
 private:
-    QVector<QRectF> calculateLayout() override;
+    QList<QRectF> calculateLayout() override;
     void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) override;
     QPointF topLeftPoint(int set, int setCount, int category, qreal barWidth, qreal value);
     QPointF bottomRightPoint(int set, int setCount, int category, qreal barWidth, qreal value);
diff --git a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp
index 6a438d94..cf799b26 100644
--- a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp
+++ b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp
@@ -112,16 +112,16 @@ QPointF HorizontalPercentBarChartItem::bottomRightPoint(int category, qreal barW
                 QPointF(value, m_seriesPosAdjustment + category + (barWidth / 2.0)), m_validData);
 }
 
-QVector<QRectF> HorizontalPercentBarChartItem::calculateLayout()
+QList<QRectF> HorizontalPercentBarChartItem::calculateLayout()
 {
-    QVector<QRectF> layout;
+    QList<QRectF> layout;
     layout.resize(m_layout.size());
 
     const int setCount = m_series->count();
     const qreal barWidth = m_series->d_func()->barWidth() * m_seriesWidth;
 
-    QVector<qreal> categorySums(m_categoryCount);
-    QVector<qreal> tempSums(m_categoryCount, 0.0);
+    QList<qreal> categorySums(m_categoryCount);
+    QList<qreal> tempSums(m_categoryCount, 0.0);
 
     for (int category = 0; category < m_categoryCount; category++)
         categorySums[category] = m_series->d_func()->categorySum(category + m_firstCategory);
diff --git a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h
index 0006202d..9a88fdd1 100644
--- a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h
+++ b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h
@@ -53,7 +53,7 @@ public:
     QString generateLabelText(int set, int category, qreal value) override;
 
 private:
-    QVector<QRectF> calculateLayout() override;
+    QList<QRectF> calculateLayout() override;
     void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) override;
     void markLabelsDirty(QBarSet *barset, int index, int count) override;
     QPointF topLeftPoint(int category, qreal barWidth, qreal value);
diff --git a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp
index dcd5b42e..cb890a6f 100644
--- a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp
+++ b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp
@@ -108,16 +108,16 @@ QPointF HorizontalStackedBarChartItem::bottomRightPoint(int category, qreal barW
                 QPointF(value, m_seriesPosAdjustment + category + (barWidth / 2)), m_validData);
 }
 
-QVector<QRectF> HorizontalStackedBarChartItem::calculateLayout()
+QList<QRectF> HorizontalStackedBarChartItem::calculateLayout()
 {
-    QVector<QRectF> layout;
+    QList<QRectF> layout;
     layout.resize(m_layout.size());
 
     const int setCount = m_series->count();
     const qreal barWidth = m_series->d_func()->barWidth() * m_seriesWidth;
 
-    QVector<qreal> positiveSums(m_categoryCount, 0.0);
-    QVector<qreal> negativeSums(m_categoryCount, 0.0);
+    QList<qreal> positiveSums(m_categoryCount, 0.0);
+    QList<qreal> negativeSums(m_categoryCount, 0.0);
 
     for (int set = 0; set < setCount; set++) {
         QBarSet *barSet = m_series->barSets().at(set);
diff --git a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h
index f779415f..e05f3dc6 100644
--- a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h
+++ b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h
@@ -52,7 +52,7 @@ public:
     HorizontalStackedBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0);
 
 private:
-    QVector<QRectF> calculateLayout() override;
+    QList<QRectF> calculateLayout() override;
     void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) override;
     QPointF topLeftPoint(int category, qreal barWidth, qreal value);
     QPointF bottomRightPoint(int category, qreal barWidth, qreal value);
diff --git a/src/charts/barchart/qabstractbarseries.cpp b/src/charts/barchart/qabstractbarseries.cpp
index 7379e8e1..f5b244ad 100644
--- a/src/charts/barchart/qabstractbarseries.cpp
+++ b/src/charts/barchart/qabstractbarseries.cpp
@@ -348,7 +348,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn void QAbstractBarSeries::barsetsAdded(QList<QBarSet*> sets)
+    \fn void QAbstractBarSeries::barsetsAdded(const QList<QBarSet *> &sets)
     This signal is emitted when the bar sets specified by \a sets are added to the series.
     \sa append(), insert()
 */
@@ -360,7 +360,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn void QAbstractBarSeries::barsetsRemoved(QList<QBarSet*> sets)
+    \fn void QAbstractBarSeries::barsetsRemoved(const QList<QBarSet *> &sets)
     This signal is emitted when the bar sets specified by \a sets are removed from the series.
     \sa remove()
 */
@@ -513,17 +513,19 @@ bool QAbstractBarSeries::take(QBarSet *set)
     If any of the sets appears in the list more than once, nothing is appended and this function
     returns \c false.
 */
-bool QAbstractBarSeries::append(QList<QBarSet *> sets)
+bool QAbstractBarSeries::append(const QList<QBarSet *> &sets)
 {
     Q_D(QAbstractBarSeries);
-    bool success = d->append(sets);
-    if (success) {
-        foreach (QBarSet *set, sets)
-            set->setParent(this);
-        emit barsetsAdded(sets);
-        emit countChanged();
-    }
-    return success;
+    if (!d->append(sets))
+        return false;
+
+    for (auto *set : sets)
+        set->setParent(this);
+
+    emit barsetsAdded(sets);
+    emit countChanged();
+
+    return true;
 }
 
 /*!
@@ -993,16 +995,16 @@ bool QAbstractBarSeriesPrivate::remove(QBarSet *set)
     return true;
 }
 
-bool QAbstractBarSeriesPrivate::append(QList<QBarSet * > sets)
+bool QAbstractBarSeriesPrivate::append(const QList<QBarSet *> &sets)
 {
-    foreach (QBarSet *set, sets) {
+    for (auto *set : sets) {
         if ((set == 0) || (m_barSets.contains(set)))
             return false; // Fail if any of the sets is null or is already appended.
         if (sets.count(set) != 1)
             return false; // Also fail if same set is more than once in given list.
     }
 
-    foreach (QBarSet *set, sets) {
+    for (auto *set : sets) {
         m_barSets.append(set);
         QObject::connect(set->d_ptr.data(), &QBarSetPrivate::updatedBars,
                          this, &QAbstractBarSeriesPrivate::updatedBars);
@@ -1018,7 +1020,7 @@ bool QAbstractBarSeriesPrivate::append(QList<QBarSet * > sets)
     return true;
 }
 
-bool QAbstractBarSeriesPrivate::remove(QList<QBarSet * > sets)
+bool QAbstractBarSeriesPrivate::remove(const QList<QBarSet *> &sets)
 {
     if (sets.count() == 0)
         return false;
diff --git a/src/charts/barchart/qabstractbarseries.h b/src/charts/barchart/qabstractbarseries.h
index e3f4ac97..07f00e98 100644
--- a/src/charts/barchart/qabstractbarseries.h
+++ b/src/charts/barchart/qabstractbarseries.h
@@ -68,7 +68,7 @@ public:
     bool append(QBarSet *set);
     bool remove(QBarSet *set);
     bool take(QBarSet *set);
-    bool append(QList<QBarSet *> sets);
+    bool append(const QList<QBarSet *> &sets);
     bool insert(int index, QBarSet *set);
     int count() const;
     QList<QBarSet *> barSets() const;
@@ -105,8 +105,8 @@ Q_SIGNALS:
     void labelsAngleChanged(qreal angle);
     void labelsPrecisionChanged(int precision);
 
-    void barsetsAdded(QList<QBarSet *> sets);
-    void barsetsRemoved(QList<QBarSet *> sets);
+    void barsetsAdded(const QList<QBarSet *> &sets);
+    void barsetsRemoved(const QList<QBarSet *> &sets);
 
 protected:
     Q_DECLARE_PRIVATE(QAbstractBarSeries)
diff --git a/src/charts/barchart/qabstractbarseries_p.h b/src/charts/barchart/qabstractbarseries_p.h
index e4ffb840..4b2038f7 100644
--- a/src/charts/barchart/qabstractbarseries_p.h
+++ b/src/charts/barchart/qabstractbarseries_p.h
@@ -76,8 +76,8 @@ public:
 
     bool append(QBarSet *set);
     bool remove(QBarSet *set);
-    bool append(QList<QBarSet *> sets);
-    bool remove(QList<QBarSet *> sets);
+    bool append(const QList<QBarSet *> &sets);
+    bool remove(const QList<QBarSet *> &sets);
     bool insert(int index, QBarSet *set);
 
     QBarSet *barsetAt(int index);
diff --git a/src/charts/barchart/qbarmodelmapper.cpp b/src/charts/barchart/qbarmodelmapper.cpp
index 39195e69..94ebda0e 100644
--- a/src/charts/barchart/qbarmodelmapper.cpp
+++ b/src/charts/barchart/qbarmodelmapper.cpp
@@ -400,7 +400,7 @@ void QBarModelMapperPrivate::removeData(int start, int end)
     initializeBarFromModel();
 }
 
-void QBarModelMapperPrivate::barSetsAdded(QList<QBarSet *> sets)
+void QBarModelMapperPrivate::barSetsAdded(const QList<QBarSet *> &sets)
 {
     if (m_seriesSignalsBlock)
         return;
@@ -447,7 +447,7 @@ void QBarModelMapperPrivate::barSetsAdded(QList<QBarSet *> sets)
     initializeBarFromModel();
 }
 
-void QBarModelMapperPrivate::barSetsRemoved(QList<QBarSet *> sets)
+void QBarModelMapperPrivate::barSetsRemoved(const QList<QBarSet *> &sets)
 {
     if (m_seriesSignalsBlock)
         return;
diff --git a/src/charts/barchart/qbarmodelmapper_p.h b/src/charts/barchart/qbarmodelmapper_p.h
index fec7c415..00d7e9db 100644
--- a/src/charts/barchart/qbarmodelmapper_p.h
+++ b/src/charts/barchart/qbarmodelmapper_p.h
@@ -68,8 +68,8 @@ public Q_SLOTS:
     void handleModelDestroyed();
 
     // for the series
-    void barSetsAdded(QList<QBarSet *> sets);
-    void barSetsRemoved(QList<QBarSet *> sets);
+    void barSetsAdded(const QList<QBarSet *> &sets);
+    void barSetsRemoved(const QList<QBarSet *> &sets);
     void valuesAdded(int index, int count);
     void valuesRemoved(int index, int count);
     void barLabelChanged();
diff --git a/src/charts/barchart/qbarset.cpp b/src/charts/barchart/qbarset.cpp
index c1fcbd8a..a21ff024 100644
--- a/src/charts/barchart/qbarset.cpp
+++ b/src/charts/barchart/qbarset.cpp
@@ -683,23 +683,23 @@ void QBarSetPrivate::append(QPointF value)
     }
 }
 
-void QBarSetPrivate::append(QList<QPointF> values)
+void QBarSetPrivate::append(const QList<QPointF> &values)
 {
     int originalIndex = m_values.count();
-    for (int i = 0; i < values.count(); i++) {
-        if (isValidValue(values.at(i)))
-            m_values.append(values.at(i));
+    for (const auto &value : values) {
+        if (isValidValue(value))
+            m_values.append(value);
     }
     emit valueAdded(originalIndex, values.size());
 }
 
-void QBarSetPrivate::append(QList<qreal> values)
+void QBarSetPrivate::append(const QList<qreal> &values)
 {
     int originalIndex = m_values.count();
     int index = originalIndex;
-    for (int i = 0; i < values.count(); i++) {
-        if (isValidValue(values.at(i))) {
-            m_values.append(QPointF(index, values.at(i)));
+    for (const auto value : values) {
+        if (isValidValue(value)) {
+            m_values.append(QPointF(index, value));
             index++;
         }
     }
diff --git a/src/charts/barchart/qbarset_p.h b/src/charts/barchart/qbarset_p.h
index 464908b7..f514dd02 100644
--- a/src/charts/barchart/qbarset_p.h
+++ b/src/charts/barchart/qbarset_p.h
@@ -57,8 +57,8 @@ public:
     ~QBarSetPrivate();
 
     void append(QPointF value);
-    void append(QList<QPointF> values);
-    void append(QList<qreal> values);
+    void append(const QList<QPointF> &values);
+    void append(const QList<qreal> &values);
 
     void insert(const int index, const qreal value);
     void insert(const int index, const QPointF value);
diff --git a/src/charts/barchart/vertical/bar/barchartitem.cpp b/src/charts/barchart/vertical/bar/barchartitem.cpp
index b50ca564..c078f5ff 100644
--- a/src/charts/barchart/vertical/bar/barchartitem.cpp
+++ b/src/charts/barchart/vertical/bar/barchartitem.cpp
@@ -97,9 +97,9 @@ QPointF BarChartItem::bottomRightPoint(int set, int setCount,
                         value), m_validData);
 }
 
-QVector<QRectF> BarChartItem::calculateLayout()
+QList<QRectF> BarChartItem::calculateLayout()
 {
-    QVector<QRectF> layout;
+    QList<QRectF> layout;
     layout.resize(m_layout.size());
 
     const int setCount = m_series->count();
diff --git a/src/charts/barchart/vertical/bar/barchartitem_p.h b/src/charts/barchart/vertical/bar/barchartitem_p.h
index da62dee7..df17d292 100644
--- a/src/charts/barchart/vertical/bar/barchartitem_p.h
+++ b/src/charts/barchart/vertical/bar/barchartitem_p.h
@@ -58,7 +58,7 @@ private Q_SLOTS:
     void positionLabels() override;
 
 private:
-    QVector<QRectF> calculateLayout() override;
+    QList<QRectF> calculateLayout() override;
     void initializeLayout(int set, int category,
                           int layoutIndex, bool resetAnimation) override;
     QPointF topLeftPoint(int set, int setCount, int category, qreal barWidth, qreal value);
diff --git a/src/charts/barchart/vertical/percent/percentbarchartitem.cpp b/src/charts/barchart/vertical/percent/percentbarchartitem.cpp
index c0521531..a3a00aa5 100644
--- a/src/charts/barchart/vertical/percent/percentbarchartitem.cpp
+++ b/src/charts/barchart/vertical/percent/percentbarchartitem.cpp
@@ -118,16 +118,16 @@ QPointF PercentBarChartItem::bottomRightPoint(int category, qreal barWidth, qrea
                 QPointF(m_seriesPosAdjustment + category + (barWidth / 2.0), value), m_validData);
 }
 
-QVector<QRectF> PercentBarChartItem::calculateLayout()
+QList<QRectF> PercentBarChartItem::calculateLayout()
 {
-    QVector<QRectF> layout;
+    QList<QRectF> layout;
     layout.resize(m_layout.size());
 
     const int setCount = m_series->count();
     const qreal barWidth = m_series->d_func()->barWidth() * m_seriesWidth;
 
-    QVector<qreal> categorySums(m_categoryCount);
-    QVector<qreal> tempSums(m_categoryCount, 0.0);
+    QList<qreal> categorySums(m_categoryCount);
+    QList<qreal> tempSums(m_categoryCount, 0.0);
 
     for (int category = 0; category < m_categoryCount; category++)
         categorySums[category] = m_series->d_func()->categorySum(category + m_firstCategory);
diff --git a/src/charts/barchart/vertical/percent/percentbarchartitem_p.h b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h
index 73c50490..0992b0e8 100644
--- a/src/charts/barchart/vertical/percent/percentbarchartitem_p.h
+++ b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h
@@ -60,7 +60,7 @@ private Q_SLOTS:
     void positionLabels() override;
 
 private:
-    QVector<QRectF> calculateLayout() override;
+    QList<QRectF> calculateLayout() override;
     void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) override;
     void markLabelsDirty(QBarSet *barset, int index, int count) override;
     QPointF topLeftPoint(int category, qreal barWidth, qreal value);
diff --git a/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp b/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp
index ba0e7874..306b8325 100644
--- a/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp
+++ b/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp
@@ -113,16 +113,16 @@ QPointF StackedBarChartItem::bottomRightPoint(int category, qreal barWidth, qrea
                 QPointF(m_seriesPosAdjustment + category + (barWidth / 2), value), m_validData);
 }
 
-QVector<QRectF> StackedBarChartItem::calculateLayout()
+QList<QRectF> StackedBarChartItem::calculateLayout()
 {
-    QVector<QRectF> layout;
+    QList<QRectF> layout;
     layout.resize(m_layout.size());
 
     const int setCount = m_series->count();
     const qreal barWidth = m_series->d_func()->barWidth() * m_seriesWidth;
 
-    QVector<qreal> positiveSums(m_categoryCount, 0.0);
-    QVector<qreal> negativeSums(m_categoryCount, 0.0);
+    QList<qreal> positiveSums(m_categoryCount, 0.0);
+    QList<qreal> negativeSums(m_categoryCount, 0.0);
 
     for (int set = 0; set < setCount; set++) {
         QBarSet *barSet = m_series->barSets().at(set);
diff --git a/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h b/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h
index 0aded9a3..2ae8adf4 100644
--- a/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h
+++ b/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h
@@ -58,7 +58,7 @@ private Q_SLOTS:
     void positionLabels() override;
 
 private:
-    QVector<QRectF> calculateLayout() override;
+    QList<QRectF> calculateLayout() override;
     void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) override;
     QPointF topLeftPoint(int category, qreal barWidth, qreal value);
     QPointF bottomRightPoint(int category, qreal barWidth, qreal value);
diff --git a/src/charts/boxplotchart/boxplotchartitem.cpp b/src/charts/boxplotchart/boxplotchartitem.cpp
index a18d7d46..1bb69270 100644
--- a/src/charts/boxplotchart/boxplotchartitem.cpp
+++ b/src/charts/boxplotchart/boxplotchartitem.cpp
@@ -151,9 +151,9 @@ void BoxPlotChartItem::handleUpdatedBars()
     }
 }
 
-void BoxPlotChartItem::handleBoxsetRemove(QList<QBoxSet*> barSets)
+void BoxPlotChartItem::handleBoxsetRemove(const QList<QBoxSet *> &barSets)
 {
-    foreach (QBoxSet *set, barSets) {
+    for (auto *set : barSets) {
         BoxWhiskers *boxItem = m_boxTable.value(set);
         m_boxTable.remove(set);
         delete boxItem;
@@ -203,9 +203,9 @@ void BoxPlotChartItem::initializeLayout()
 {
 }
 
-QVector<QRectF> BoxPlotChartItem::calculateLayout()
+QList<QRectF> BoxPlotChartItem::calculateLayout()
 {
-    return QVector<QRectF>();
+    return QList<QRectF>();
 }
 
 bool BoxPlotChartItem::updateBoxGeometry(BoxWhiskers *box, int index)
diff --git a/src/charts/boxplotchart/boxplotchartitem_p.h b/src/charts/boxplotchart/boxplotchartitem_p.h
index 7d4c36db..f95543a4 100644
--- a/src/charts/boxplotchart/boxplotchartitem_p.h
+++ b/src/charts/boxplotchart/boxplotchartitem_p.h
@@ -71,10 +71,10 @@ public Q_SLOTS:
     void handleDomainUpdated() override;
     void handleLayoutChanged();
     void handleUpdatedBars();
-    void handleBoxsetRemove(QList<QBoxSet *> barSets);
+    void handleBoxsetRemove(const QList<QBoxSet *> &barSets);
 
 private:
-    virtual QVector<QRectF> calculateLayout();
+    virtual QList<QRectF> calculateLayout();
     void initializeLayout();
     bool updateBoxGeometry(BoxWhiskers *box, int index);
 
diff --git a/src/charts/boxplotchart/qboxplotmodelmapper.cpp b/src/charts/boxplotchart/qboxplotmodelmapper.cpp
index e9756a22..7d365d5f 100644
--- a/src/charts/boxplotchart/qboxplotmodelmapper.cpp
+++ b/src/charts/boxplotchart/qboxplotmodelmapper.cpp
@@ -386,7 +386,7 @@ void QBoxPlotModelMapperPrivate::removeData(int start, int end)
     initializeBoxFromModel();
 }
 
-void QBoxPlotModelMapperPrivate::boxSetsAdded(QList<QBoxSet *> sets)
+void QBoxPlotModelMapperPrivate::boxSetsAdded(const QList<QBoxSet *> &sets)
 {
     if (m_seriesSignalsBlock)
         return;
@@ -432,7 +432,7 @@ void QBoxPlotModelMapperPrivate::boxSetsAdded(QList<QBoxSet *> sets)
     initializeBoxFromModel();
 }
 
-void QBoxPlotModelMapperPrivate::boxSetsRemoved(QList<QBoxSet *> sets)
+void QBoxPlotModelMapperPrivate::boxSetsRemoved(const QList<QBoxSet *> &sets)
 {
     if (m_seriesSignalsBlock)
         return;
diff --git a/src/charts/boxplotchart/qboxplotmodelmapper_p.h b/src/charts/boxplotchart/qboxplotmodelmapper_p.h
index 1f6abbbd..ee92fcb7 100644
--- a/src/charts/boxplotchart/qboxplotmodelmapper_p.h
+++ b/src/charts/boxplotchart/qboxplotmodelmapper_p.h
@@ -68,8 +68,8 @@ public Q_SLOTS:
     void handleModelDestroyed();
 
     // for the series
-    void boxSetsAdded(QList<QBoxSet *> sets);
-    void boxSetsRemoved(QList<QBoxSet *> sets);
+    void boxSetsAdded(const QList<QBoxSet *> &sets);
+    void boxSetsRemoved(const QList<QBoxSet *> &sets);
     void boxValueChanged(int index);
     void handleSeriesDestroyed();
 
diff --git a/src/charts/boxplotchart/qboxplotseries.cpp b/src/charts/boxplotchart/qboxplotseries.cpp
index 6649c49f..61718044 100644
--- a/src/charts/boxplotchart/qboxplotseries.cpp
+++ b/src/charts/boxplotchart/qboxplotseries.cpp
@@ -62,12 +62,12 @@ QT_CHARTS_BEGIN_NAMESPACE
     \sa QBoxSet, QBarCategoryAxis
 */
 /*!
-    \fn QBoxPlotSeries::boxsetsAdded(QList<QBoxSet *> sets)
+    \fn QBoxPlotSeries::boxsetsAdded(const QList<QBoxSet *> &sets)
     This signal is emitted when the list of box-and-whiskers items specified by \a sets
     is added to the series.
 */
 /*!
-    \fn QBoxPlotSeries::boxsetsRemoved(QList<QBoxSet *> sets)
+    \fn QBoxPlotSeries::boxsetsRemoved(const QList<QBoxSet *> &sets)
     This signal is emitted when the list of box-and-whiskers items specified by \a sets
     is removed from the series.
 */
@@ -236,7 +236,7 @@ bool QBoxPlotSeries::take(QBoxSet *set)
     them. If the list is null or the items already belong to the series, it will not be appended.
     Returns \c true if appending succeeded.
 */
-bool QBoxPlotSeries::append(QList<QBoxSet *> sets)
+bool QBoxPlotSeries::append(const QList<QBoxSet *> &sets)
 {
     Q_D(QBoxPlotSeries);
     bool success = d->append(sets);
@@ -618,16 +618,16 @@ bool QBoxPlotSeriesPrivate::remove(QBoxSet *set)
     return true;
 }
 
-bool QBoxPlotSeriesPrivate::append(QList<QBoxSet *> sets)
+bool QBoxPlotSeriesPrivate::append(const QList<QBoxSet *> &sets)
 {
-    foreach (QBoxSet *set, sets) {
+    for (auto *set : sets) {
         if ((set == 0) || m_boxSets.contains(set) || set->d_ptr->m_series)
             return false; // Fail if any of the sets is null or is already appended.
         if (sets.count(set) != 1)
             return false; // Also fail if same set is more than once in given list.
     }
 
-    foreach (QBoxSet *set, sets) {
+    for (auto *set : sets) {
         m_boxSets.append(set);
         QObject::connect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
         QObject::connect(set->d_ptr.data(), SIGNAL(updatedBox()), this, SIGNAL(updatedBoxes()));
@@ -639,19 +639,19 @@ bool QBoxPlotSeriesPrivate::append(QList<QBoxSet *> sets)
     return true;
 }
 
-bool QBoxPlotSeriesPrivate::remove(QList<QBoxSet *> sets)
+bool QBoxPlotSeriesPrivate::remove(const QList<QBoxSet *> &sets)
 {
     if (sets.count() == 0)
         return false;
 
-    foreach (QBoxSet *set, sets) {
+    for (auto *set : sets) {
         if ((set == 0) || (!m_boxSets.contains(set)))
             return false; // Fail if any of the sets is null or is not in series
         if (sets.count(set) != 1)
             return false; // Also fail if same set is more than once in given list.
     }
 
-    foreach (QBoxSet *set, sets) {
+    for (auto *set : sets) {
         set->d_ptr->m_series = 0;
         m_boxSets.removeOne(set);
         QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
diff --git a/src/charts/boxplotchart/qboxplotseries.h b/src/charts/boxplotchart/qboxplotseries.h
index 958ece58..bd12a41c 100644
--- a/src/charts/boxplotchart/qboxplotseries.h
+++ b/src/charts/boxplotchart/qboxplotseries.h
@@ -53,7 +53,7 @@ public:
     bool append(QBoxSet *box);
     bool remove(QBoxSet *box);
     bool take(QBoxSet *box);
-    bool append(QList<QBoxSet *> boxes);
+    bool append(const QList<QBoxSet *> &boxes);
     bool insert(int index, QBoxSet *box);
     int count() const;
     QList<QBoxSet *> boxSets() const;
@@ -82,8 +82,8 @@ Q_SIGNALS:
     void boxOutlineVisibilityChanged();
     void boxWidthChanged();
 
-    void boxsetsAdded(QList<QBoxSet *> sets);
-    void boxsetsRemoved(QList<QBoxSet *> sets);
+    void boxsetsAdded(const QList<QBoxSet *> &sets);
+    void boxsetsRemoved(const QList<QBoxSet *> &sets);
 
 private:
     Q_DECLARE_PRIVATE(QBoxPlotSeries)
diff --git a/src/charts/boxplotchart/qboxplotseries_p.h b/src/charts/boxplotchart/qboxplotseries_p.h
index 160b179c..4efeb68c 100644
--- a/src/charts/boxplotchart/qboxplotseries_p.h
+++ b/src/charts/boxplotchart/qboxplotseries_p.h
@@ -70,8 +70,8 @@ public:
 
     bool append(QBoxSet *set);
     bool remove(QBoxSet *set);
-    bool append(QList<QBoxSet *> sets);
-    bool remove(QList<QBoxSet *> sets);
+    bool append(const QList<QBoxSet *> &sets);
+    bool remove(const QList<QBoxSet *> &sets);
     bool insert(int index, QBoxSet *set);
     QBoxSet *boxSetAt(int index);
 
diff --git a/src/charts/boxplotchart/qboxset.cpp b/src/charts/boxplotchart/qboxset.cpp
index 85c2d434..07434f91 100644
--- a/src/charts/boxplotchart/qboxset.cpp
+++ b/src/charts/boxplotchart/qboxset.cpp
@@ -323,14 +323,14 @@ bool QBoxSetPrivate::append(qreal value)
     return false;
 }
 
-bool QBoxSetPrivate::append(QList<qreal> values)
+bool QBoxSetPrivate::append(const QList<qreal> &values)
 {
     bool success = false;
 
-    for (int i = 0; i < values.count(); i++) {
-        if (isValidValue(values.at(i)) && m_appendCount < m_valuesCount) {
+    for (const qreal value : values) {
+        if (isValidValue(value) && m_appendCount < m_valuesCount) {
             success = true;
-            m_values[m_appendCount++] = values.at(i);
+            m_values[m_appendCount++] = value;
         }
     }
 
diff --git a/src/charts/boxplotchart/qboxset_p.h b/src/charts/boxplotchart/qboxset_p.h
index 5bcbbb0b..f6997b54 100644
--- a/src/charts/boxplotchart/qboxset_p.h
+++ b/src/charts/boxplotchart/qboxset_p.h
@@ -59,7 +59,7 @@ public:
     ~QBoxSetPrivate();
 
     bool append(qreal value);
-    bool append(QList<qreal> values);
+    bool append(const QList<qreal> &values);
 
     int remove(const int index, const int count);
     void clear();
diff --git a/src/charts/candlestickchart/qcandlestickmodelmapper.cpp b/src/charts/candlestickchart/qcandlestickmodelmapper.cpp
index 95a53b52..e9cdc23d 100644
--- a/src/charts/candlestickchart/qcandlestickmodelmapper.cpp
+++ b/src/charts/candlestickchart/qcandlestickmodelmapper.cpp
@@ -592,7 +592,7 @@ void QCandlestickModelMapperPrivate::candlestickSetsRemoved(const QList<QCandles
     if (sets.isEmpty())
         return;
 
-    QVector<int> removedIndices;
+    QList<int> removedIndices;
     for (auto &set : sets) {
         int index = m_sets.indexOf(set);
         if (index != -1)
diff --git a/src/charts/chartdataset.cpp b/src/charts/chartdataset.cpp
index 2b2eda17..e31ea513 100644
--- a/src/charts/chartdataset.cpp
+++ b/src/charts/chartdataset.cpp
@@ -398,7 +398,8 @@ void ChartDataSet::createAxes(QAbstractAxis::AxisTypes type, Qt::Orientation ori
     }
 }
 
-void ChartDataSet::findMinMaxForSeries(QList<QAbstractSeries *> series,Qt::Orientations orientation, qreal &min, qreal &max)
+void ChartDataSet::findMinMaxForSeries(const QList<QAbstractSeries *> &series,
+                                       Qt::Orientations orientation, qreal &min, qreal &max)
 {
     Q_ASSERT(!series.isEmpty());
 
@@ -407,7 +408,7 @@ void ChartDataSet::findMinMaxForSeries(QList<QAbstractSeries *> series,Qt::Orien
     max = (orientation == Qt::Vertical) ? domain->maxY() : domain->maxX();
 
     for (int i = 1; i< series.size(); i++) {
-        AbstractDomain *domain = series[i]->d_ptr->domain();
+        AbstractDomain *domain = series.at(i)->d_ptr->domain();
         min = qMin((orientation == Qt::Vertical) ? domain->minY() : domain->minX(), min);
         max = qMax((orientation == Qt::Vertical) ? domain->maxY() : domain->maxX(), max);
     }
@@ -547,7 +548,7 @@ QList<QAbstractSeries *> ChartDataSet::series() const
     return m_seriesList;
 }
 
-AbstractDomain::DomainType ChartDataSet::selectDomain(QList<QAbstractAxis *> axes)
+AbstractDomain::DomainType ChartDataSet::selectDomain(const QList<QAbstractAxis *> &axes)
 {
     enum Type {
         Undefined = 0,
@@ -563,8 +564,7 @@ AbstractDomain::DomainType ChartDataSet::selectDomain(QList<QAbstractAxis *> axe
     if (m_chart)
         chartType = m_chart->chartType();
 
-    foreach (QAbstractAxis *axis, axes)
-    {
+    for (auto *axis : axes) {
         switch (axis->type()) {
         case QAbstractAxis::AxisTypeLogValue:
             if (axis->orientation() == Qt::Horizontal)
diff --git a/src/charts/chartdataset_p.h b/src/charts/chartdataset_p.h
index cafd6f88..5c83f5c8 100644
--- a/src/charts/chartdataset_p.h
+++ b/src/charts/chartdataset_p.h
@@ -43,7 +43,7 @@
 #include <private/abstractdomain_p.h>
 #include <private/qabstractaxis_p.h>
 #include <QtCharts/private/qchartglobal_p.h>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 
 QT_CHARTS_BEGIN_NAMESPACE
 
@@ -95,10 +95,12 @@ public Q_SLOTS:
 private:
     void createAxes(QAbstractAxis::AxisTypes type, Qt::Orientation orientation);
     QAbstractAxis *createAxis(QAbstractAxis::AxisType type, Qt::Orientation orientation);
-    AbstractDomain::DomainType selectDomain(QList<QAbstractAxis* > axes);
+    AbstractDomain::DomainType selectDomain(const QList<QAbstractAxis *> &axes);
     void deleteAllAxes();
     void deleteAllSeries();
-    void findMinMaxForSeries(QList<QAbstractSeries *> series,Qt::Orientations orientation, qreal &min, qreal &max);
+    void findMinMaxForSeries(const QList<QAbstractSeries *> &series, Qt::Orientations orientation,
+                             qreal &min, qreal &max);
+
 private:
     QList<QAbstractSeries *> m_seriesList;
     QList<QAbstractAxis *> m_axisList;
diff --git a/src/charts/chartpresenter.cpp b/src/charts/chartpresenter.cpp
index 6be0b141..38d47eb4 100644
--- a/src/charts/chartpresenter.cpp
+++ b/src/charts/chartpresenter.cpp
@@ -513,7 +513,7 @@ QString ChartPresenter::truncatedText(const QFont &font, const QString &text, qr
         // to try.
         static QRegularExpression truncateMatcher(QStringLiteral("&#?[0-9a-zA-Z]*;$"));
 
-        QVector<QString> testStrings(text.length());
+        QList<QString> testStrings(text.length());
         int count(0);
         static QLatin1Char closeTag('>');
         static QLatin1Char openTag('<');
diff --git a/src/charts/chartthememanager.cpp b/src/charts/chartthememanager.cpp
index c6045e36..bbbb4f82 100644
--- a/src/charts/chartthememanager.cpp
+++ b/src/charts/chartthememanager.cpp
@@ -116,22 +116,18 @@ void ChartThemeManager::decorateLegend(QLegend *legend, ChartTheme *theme) const
     legend->setLabelBrush(theme->labelBrush());
 }
 
-int ChartThemeManager::createIndexKey(QList<int> keys) const
+int ChartThemeManager::createIndexKey(const QList<int> &keys) const
 {
-    std::sort(keys.begin(), keys.end());
+    auto keysCopy = keys;
+    std::sort(keysCopy.begin(), keysCopy.end());
 
-    int key = 0;
-    QList<int>::iterator i;
-    i = keys.begin();
-
-    while (i != keys.end()) {
-        if (*i != key)
+    int i = 0;
+    for (const auto key : keysCopy) {
+        if (i != key)
             break;
-        key++;
-        i++;
+        ++i;
     }
-
-    return key;
+    return i;
 }
 
 int ChartThemeManager::seriesCount(QAbstractSeries::SeriesType type) const
diff --git a/src/charts/chartthememanager_p.h b/src/charts/chartthememanager_p.h
index c5e137ec..80cff083 100644
--- a/src/charts/chartthememanager_p.h
+++ b/src/charts/chartthememanager_p.h
@@ -74,7 +74,7 @@ public:
     static QColor colorAt(const QGradient &gradient, qreal pos);
 
 private:
-    int createIndexKey(QList<int> keys) const;
+    int createIndexKey(const QList<int> &keys) const;
     int seriesCount(QAbstractSeries::SeriesType type) const;
 
 public Q_SLOTS:
diff --git a/src/charts/domain/abstractdomain_p.h b/src/charts/domain/abstractdomain_p.h
index 6b12f624..a3b93159 100644
--- a/src/charts/domain/abstractdomain_p.h
+++ b/src/charts/domain/abstractdomain_p.h
@@ -104,7 +104,7 @@ public:
 
     virtual QPointF calculateGeometryPoint(const QPointF &point, bool &ok) const = 0;
     virtual QPointF calculateDomainPoint(const QPointF &point) const = 0;
-    virtual QVector<QPointF> calculateGeometryPoints(const QVector<QPointF> &vector) const = 0;
+    virtual QList<QPointF> calculateGeometryPoints(const QList<QPointF> &list) const = 0;
 
     virtual bool attachAxis(QAbstractAxis *axis);
     virtual bool detachAxis(QAbstractAxis *axis);
diff --git a/src/charts/domain/logxlogydomain.cpp b/src/charts/domain/logxlogydomain.cpp
index 04ba559f..021cb32c 100644
--- a/src/charts/domain/logxlogydomain.cpp
+++ b/src/charts/domain/logxlogydomain.cpp
@@ -182,27 +182,27 @@ QPointF LogXLogYDomain::calculateGeometryPoint(const QPointF &point, bool &ok) c
     return QPointF(x, y);
 }
 
-QVector<QPointF> LogXLogYDomain::calculateGeometryPoints(const QVector<QPointF> &vector) const
+QList<QPointF> LogXLogYDomain::calculateGeometryPoints(const QList<QPointF> &list) const
 {
     const qreal deltaX = m_size.width() / qAbs(m_logRightX - m_logLeftX);
     const qreal deltaY = m_size.height() / qAbs(m_logRightY - m_logLeftY);
 
-    QVector<QPointF> result;
-    result.resize(vector.count());
+    QList<QPointF> result;
+    result.resize(list.count());
 
-    for (int i = 0; i < vector.count(); ++i) {
-        if (vector[i].x() > 0 && vector[i].y() > 0) {
-            qreal x = ((std::log10(vector[i].x()) / std::log10(m_logBaseX)) - m_logLeftX) * deltaX;
+    for (int i = 0; i < list.count(); ++i) {
+        if (list[i].x() > 0 && list[i].y() > 0) {
+            qreal x = ((std::log10(list[i].x()) / std::log10(m_logBaseX)) - m_logLeftX) * deltaX;
             if (m_reverseX)
                 x = m_size.width() - x;
-            qreal y = ((std::log10(vector[i].y()) / std::log10(m_logBaseY)) - m_logLeftY) * deltaY;
+            qreal y = ((std::log10(list[i].y()) / std::log10(m_logBaseY)) - m_logLeftY) * deltaY;
             if (!m_reverseY)
                 y = m_size.height() - y;
             result[i].setX(x);
             result[i].setY(y);
         } else {
             qWarning() << "Logarithms of zero and negative values are undefined.";
-            return QVector<QPointF>();
+            return QList<QPointF>();
         }
     }
     return result;
diff --git a/src/charts/domain/logxlogydomain_p.h b/src/charts/domain/logxlogydomain_p.h
index 99d6daa7..c1c4d8ce 100644
--- a/src/charts/domain/logxlogydomain_p.h
+++ b/src/charts/domain/logxlogydomain_p.h
@@ -66,7 +66,7 @@ public:
 
     QPointF calculateGeometryPoint(const QPointF &point, bool &ok) const override;
     QPointF calculateDomainPoint(const QPointF &point) const override;
-    QVector<QPointF> calculateGeometryPoints(const QVector<QPointF> &vector) const override;
+    QList<QPointF> calculateGeometryPoints(const QList<QPointF> &list) const override;
 
     bool attachAxis(QAbstractAxis *axis) override;
     bool detachAxis(QAbstractAxis *axis) override;
diff --git a/src/charts/domain/logxydomain.cpp b/src/charts/domain/logxydomain.cpp
index fb77656c..7334ce52 100644
--- a/src/charts/domain/logxydomain.cpp
+++ b/src/charts/domain/logxydomain.cpp
@@ -168,29 +168,28 @@ QPointF LogXYDomain::calculateGeometryPoint(const QPointF &point, bool &ok) cons
     return QPointF(x, y);
 }
 
-QVector<QPointF> LogXYDomain::calculateGeometryPoints(const QVector<QPointF> &vector) const
+QList<QPointF> LogXYDomain::calculateGeometryPoints(const QList<QPointF> &list) const
 {
     const qreal deltaX = m_size.width() / (m_logRightX - m_logLeftX);
     const qreal deltaY = m_size.height() / (m_maxY - m_minY);
 
-    QVector<QPointF> result;
-    result.resize(vector.count());
+    QList<QPointF> result;
+    result.resize(list.count());
 
-    for (int i = 0; i < vector.count(); ++i) {
-        if (vector[i].x() > 0) {
-            qreal x = ((std::log10(vector[i].x()) / std::log10(m_logBaseX)) - m_logLeftX) * deltaX;
+    for (int i = 0; i < list.count(); ++i) {
+        if (list[i].x() > 0) {
+            qreal x = ((std::log10(list[i].x()) / std::log10(m_logBaseX)) - m_logLeftX) * deltaX;
             if (m_reverseX)
                 x = m_size.width() - x;
-            qreal y = (vector[i].y() - m_minY) * deltaY;
+            qreal y = (list[i].y() - m_minY) * deltaY;
             if (!m_reverseY)
                 y = m_size.height() - y;
             result[i].setX(x);
             result[i].setY(y);
         } else {
             qWarning() << "Logarithms of zero and negative values are undefined.";
-            return QVector<QPointF>();
+            return QList<QPointF>();
         }
-
     }
     return result;
 }
diff --git a/src/charts/domain/logxydomain_p.h b/src/charts/domain/logxydomain_p.h
index 4f1e2637..6a0869c7 100644
--- a/src/charts/domain/logxydomain_p.h
+++ b/src/charts/domain/logxydomain_p.h
@@ -66,7 +66,7 @@ public:
 
     QPointF calculateGeometryPoint(const QPointF &point, bool &ok) const override;
     QPointF calculateDomainPoint(const QPointF &point) const override;
-    QVector<QPointF> calculateGeometryPoints(const QVector<QPointF> &vector) const override;
+    QList<QPointF> calculateGeometryPoints(const QList<QPointF> &list) const override;
 
     bool attachAxis(QAbstractAxis *axis) override;
     bool detachAxis(QAbstractAxis *axis) override;
diff --git a/src/charts/domain/polardomain.cpp b/src/charts/domain/polardomain.cpp
index 59027d51..531c592e 100644
--- a/src/charts/domain/polardomain.cpp
+++ b/src/charts/domain/polardomain.cpp
@@ -64,23 +64,23 @@ QPointF PolarDomain::calculateGeometryPoint(const QPointF &point, bool &ok) cons
     }
 }
 
-QVector<QPointF> PolarDomain::calculateGeometryPoints(const QVector<QPointF> &vector) const
+QList<QPointF> PolarDomain::calculateGeometryPoints(const QList<QPointF> &list) const
 {
-    QVector<QPointF> result;
-    result.resize(vector.count());
+    QList<QPointF> result;
+    result.resize(list.count());
     bool ok;
     qreal r = 0.0;
     qreal a = 0.0;
 
-    for (int i = 0; i < vector.count(); ++i) {
-        a = toAngularCoordinate(vector[i].x(), ok);
+    for (int i = 0; i < list.count(); ++i) {
+        a = toAngularCoordinate(list[i].x(), ok);
         if (ok)
-            r = toRadialCoordinate(vector[i].y(), ok);
+            r = toRadialCoordinate(list[i].y(), ok);
         if (ok) {
             result[i] = m_center + polarCoordinateToPoint(a, r);
         } else {
             qWarning() << "Logarithm of negative value is undefined. Empty layout returned.";
-            return QVector<QPointF>();
+            return QList<QPointF>();
         }
     }
 
diff --git a/src/charts/domain/polardomain_p.h b/src/charts/domain/polardomain_p.h
index e049a271..3330009b 100644
--- a/src/charts/domain/polardomain_p.h
+++ b/src/charts/domain/polardomain_p.h
@@ -55,7 +55,7 @@ public:
     void setSize(const QSizeF &size) override;
 
     QPointF calculateGeometryPoint(const QPointF &point, bool &ok) const override;
-    QVector<QPointF> calculateGeometryPoints(const QVector<QPointF> &vector) const override;
+    QList<QPointF> calculateGeometryPoints(const QList<QPointF> &list) const override;
 
     virtual qreal toAngularCoordinate(qreal value, bool &ok) const = 0;
     virtual qreal toRadialCoordinate(qreal value, bool &ok) const = 0;
diff --git a/src/charts/domain/xlogydomain.cpp b/src/charts/domain/xlogydomain.cpp
index 0cd995f3..e6761826 100644
--- a/src/charts/domain/xlogydomain.cpp
+++ b/src/charts/domain/xlogydomain.cpp
@@ -168,27 +168,27 @@ QPointF XLogYDomain::calculateGeometryPoint(const QPointF &point, bool &ok) cons
     return QPointF(x, y);
 }
 
-QVector<QPointF> XLogYDomain::calculateGeometryPoints(const QVector<QPointF> &vector) const
+QList<QPointF> XLogYDomain::calculateGeometryPoints(const QList<QPointF> &list) const
 {
     const qreal deltaX = m_size.width() / (m_maxX - m_minX);
     const qreal deltaY = m_size.height() / qAbs(m_logRightY - m_logLeftY);
 
-    QVector<QPointF> result;
-    result.resize(vector.count());
+    QList<QPointF> result;
+    result.resize(list.count());
 
-    for (int i = 0; i < vector.count(); ++i) {
-        if (vector[i].y() > 0) {
-            qreal x = (vector[i].x() - m_minX) * deltaX;
+    for (int i = 0; i < list.count(); ++i) {
+        if (list[i].y() > 0) {
+            qreal x = (list[i].x() - m_minX) * deltaX;
             if (m_reverseX)
                 x = m_size.width() - x;
-            qreal y = ((std::log10(vector[i].y()) / std::log10(m_logBaseY)) - m_logLeftY) * deltaY;
+            qreal y = ((std::log10(list[i].y()) / std::log10(m_logBaseY)) - m_logLeftY) * deltaY;
             if (!m_reverseY)
                 y = m_size.height() - y;
             result[i].setX(x);
             result[i].setY(y);
         } else {
             qWarning() << "Logarithms of zero and negative values are undefined.";
-            return QVector<QPointF>();
+            return QList<QPointF>();
         }
     }
     return result;
diff --git a/src/charts/domain/xlogydomain_p.h b/src/charts/domain/xlogydomain_p.h
index e9e8b943..629b2fbf 100644
--- a/src/charts/domain/xlogydomain_p.h
+++ b/src/charts/domain/xlogydomain_p.h
@@ -66,7 +66,7 @@ public:
 
     QPointF calculateGeometryPoint(const QPointF &point, bool &ok) const override;
     QPointF calculateDomainPoint(const QPointF &point) const override;
-    QVector<QPointF> calculateGeometryPoints(const QVector<QPointF> &vector) const override;
+    QList<QPointF> calculateGeometryPoints(const QList<QPointF> &list) const override;
 
     bool attachAxis(QAbstractAxis *axis) override;
     bool detachAxis(QAbstractAxis *axis) override;
diff --git a/src/charts/domain/xydomain.cpp b/src/charts/domain/xydomain.cpp
index e023c71f..6fd97a6e 100644
--- a/src/charts/domain/xydomain.cpp
+++ b/src/charts/domain/xydomain.cpp
@@ -170,23 +170,23 @@ QPointF XYDomain::calculateGeometryPoint(const QPointF &point, bool &ok) const
     return QPointF(x, y);
 }
 
-QVector<QPointF> XYDomain::calculateGeometryPoints(const QVector<QPointF> &vector) const
+QList<QPointF> XYDomain::calculateGeometryPoints(const QList<QPointF> &list) const
 {
     const qreal xd = m_maxX - m_minX;
     const qreal yd = m_maxY - m_minY;
     if (qFuzzyIsNull(xd) || qFuzzyIsNull(yd))
-        return QVector<QPointF>();
+        return QList<QPointF>();
     const qreal deltaX = m_size.width() / xd;
     const qreal deltaY = m_size.height() / yd;
 
-    QVector<QPointF> result;
-    result.resize(vector.count());
+    QList<QPointF> result;
+    result.resize(list.count());
 
-    for (int i = 0; i < vector.count(); ++i) {
-        qreal x = (vector[i].x() - m_minX) * deltaX;
+    for (int i = 0; i < list.count(); ++i) {
+        qreal x = (list[i].x() - m_minX) * deltaX;
         if (m_reverseX)
             x = m_size.width() - x;
-        qreal y = (vector[i].y() - m_minY) * deltaY;
+        qreal y = (list[i].y() - m_minY) * deltaY;
         if (!m_reverseY)
             y = m_size.height() - y;
         result[i].setX(x);
diff --git a/src/charts/domain/xydomain_p.h b/src/charts/domain/xydomain_p.h
index 5733adfa..2923a8ee 100644
--- a/src/charts/domain/xydomain_p.h
+++ b/src/charts/domain/xydomain_p.h
@@ -66,7 +66,7 @@ public:
 
     QPointF calculateGeometryPoint(const QPointF &point, bool &ok) const override;
     QPointF calculateDomainPoint(const QPointF &point) const override;
-    QVector<QPointF> calculateGeometryPoints(const QVector<QPointF> &vector) const override;
+    QList<QPointF> calculateGeometryPoints(const QList<QPointF> &list) const override;
 };
 
 QT_CHARTS_END_NAMESPACE
diff --git a/src/charts/glwidget.cpp b/src/charts/glwidget.cpp
index 207e91cb..a712b7b4 100644
--- a/src/charts/glwidget.cpp
+++ b/src/charts/glwidget.cpp
@@ -288,7 +288,7 @@ QXYSeries *GLWidget::findSeriesAtEvent(QMouseEvent *event)
         m_selectionFbo->bind();
 
         if (m_selectionRenderNeeded) {
-            m_selectionVector.resize(m_xyDataManager->dataMap().size());
+            m_selectionList.resize(m_xyDataManager->dataMap().size());
             render(true);
             m_selectionRenderNeeded = false;
         }
@@ -307,8 +307,8 @@ QXYSeries *GLWidget::findSeriesAtEvent(QMouseEvent *event)
 
     if (index >= 0) {
         const QXYSeries *cSeries = nullptr;
-        if (index < m_selectionVector.size())
-            cSeries = m_selectionVector.at(index);
+        if (index < m_selectionList.size())
+            cSeries = m_selectionList.at(index);
 
         series = chartSeries(cSeries);
     }
@@ -335,7 +335,7 @@ void GLWidget::render(bool selection)
 
         if (data->visible) {
             if (selection) {
-                m_selectionVector[counter] = i.key();
+                m_selectionList[counter] = i.key();
                 m_program->setUniformValue(m_colorUniformLoc, QVector3D((counter & 0xff) / 255.0f,
                                                                         ((counter & 0xff00) >> 8) / 255.0f,
                                                                         ((counter & 0xff0000) >> 16) / 255.0f));
diff --git a/src/charts/glwidget_p.h b/src/charts/glwidget_p.h
index 761611aa..8007fe7d 100644
--- a/src/charts/glwidget_p.h
+++ b/src/charts/glwidget_p.h
@@ -102,7 +102,7 @@ private:
     QGraphicsView *m_view;
     QOpenGLFramebufferObject *m_selectionFbo;
     QSize m_fboSize;
-    QVector<const QXYSeries *> m_selectionVector;
+    QList<const QXYSeries *> m_selectionList;
     QChart *m_chart;
     bool m_recreateSelectionFbo;
     bool m_selectionRenderNeeded;
diff --git a/src/charts/legend/qlegend.cpp b/src/charts/legend/qlegend.cpp
index 1a4f0ea2..2fa9d5e3 100644
--- a/src/charts/legend/qlegend.cpp
+++ b/src/charts/legend/qlegend.cpp
@@ -744,7 +744,7 @@ void QLegendPrivate::handleCountChanged()
     QAbstractSeriesPrivate *seriesP = qobject_cast<QAbstractSeriesPrivate *>(sender());
     QAbstractSeries *series = seriesP->q_ptr;
     QList<QLegendMarker *> createdMarkers = seriesP->createLegendMarkers(q_ptr);
-    QVector<bool> isNew(createdMarkers.size(), true);
+    QList<bool> isNew(createdMarkers.size(), true);
 
     const int pos = indexOfSeries(series, m_markers);
     // Remove markers of the series from m_markers and check against the newly
@@ -790,9 +790,9 @@ void QLegendPrivate::insertMarkerHelper(QLegendMarker *marker)
     m_markerHash.insert(item, marker);
 }
 
-void QLegendPrivate::addMarkers(QList<QLegendMarker *> markers)
+void QLegendPrivate::addMarkers(const QList<QLegendMarker *> &markers)
 {
-    foreach (QLegendMarker *marker, markers) {
+    for (auto *marker : markers) {
         insertMarkerHelper(marker);
         m_markers << marker;
     }
@@ -808,9 +808,9 @@ void QLegendPrivate::removeMarkerHelper(QLegendMarker *marker)
     delete marker;
 }
 
-void QLegendPrivate::removeMarkers(QList<QLegendMarker *> markers)
+void QLegendPrivate::removeMarkers(const QList<QLegendMarker *> &markers)
 {
-    foreach (QLegendMarker *marker, markers) {
+    for (auto *marker : markers) {
         m_markers.removeOne(marker);
         removeMarkerHelper(marker);
     }
@@ -822,9 +822,9 @@ void QLegendPrivate::decorateMarker(QLegendMarker *marker)
     marker->setLabelBrush(m_labelBrush);
 }
 
-void QLegendPrivate::decorateMarkers(QList<QLegendMarker *> markers)
+void QLegendPrivate::decorateMarkers(const QList<QLegendMarker *> &markers)
 {
-    for (QLegendMarker *marker : markers)
+    for (auto *marker : markers)
         decorateMarker(marker);
 }
 
diff --git a/src/charts/legend/qlegend_p.h b/src/charts/legend/qlegend_p.h
index 138ebddb..e65d3025 100644
--- a/src/charts/legend/qlegend_p.h
+++ b/src/charts/legend/qlegend_p.h
@@ -77,11 +77,11 @@ public Q_SLOTS:
 private:
     // Internal helpers
     void insertMarkerHelper(QLegendMarker *marker);
-    void addMarkers(QList<QLegendMarker *> markers);
+    void addMarkers(const QList<QLegendMarker *> &markers);
     void removeMarkerHelper(QLegendMarker *marker);
-    void removeMarkers(QList<QLegendMarker *> markers);
+    void removeMarkers(const QList<QLegendMarker *> &markers);
     void decorateMarker(QLegendMarker *marker);
-    void decorateMarkers(QList<QLegendMarker *> markers);
+    void decorateMarkers(const QList<QLegendMarker *> &markers);
     void updateToolTips();
 
 private:
diff --git a/src/charts/linechart/linechartitem.cpp b/src/charts/linechart/linechartitem.cpp
index c6eb2d07..5d76cc2c 100644
--- a/src/charts/linechart/linechartitem.cpp
+++ b/src/charts/linechart/linechartitem.cpp
@@ -92,7 +92,7 @@ void LineChartItem::updateGeometry()
     // Store the points to a local variable so that the old line gets properly cleared
     // when animation starts.
     m_linePoints = geometryPoints();
-    const QVector<QPointF> &points = m_linePoints;
+    const QList<QPointF> &points = m_linePoints;
 
     if (points.size() == 0) {
         prepareGeometryChange();
diff --git a/src/charts/linechart/linechartitem_p.h b/src/charts/linechart/linechartitem_p.h
index 69327034..91172c61 100644
--- a/src/charts/linechart/linechartitem_p.h
+++ b/src/charts/linechart/linechartitem_p.h
@@ -86,7 +86,7 @@ private:
     QPainterPath m_fullPath;
     QPainterPath m_shapePath;
 
-    QVector<QPointF> m_linePoints;
+    QList<QPointF> m_linePoints;
     QRectF m_rect;
     QPen m_linePen;
     bool m_pointsVisible;
diff --git a/src/charts/piechart/piechartitem.cpp b/src/charts/piechart/piechartitem.cpp
index 2fe0feff..0eb3f9e8 100644
--- a/src/charts/piechart/piechartitem.cpp
+++ b/src/charts/piechart/piechartitem.cpp
@@ -156,7 +156,7 @@ void PieChartItem::updateLayout()
     foreach (QPieSlice *slice, m_series->slices()) {
         PieSliceItem *sliceItem = m_sliceItems.value(slice);
         if (sliceItem) {
-            PieSliceData sliceData = updateSliceGeometry(slice);
+            const PieSliceData sliceData = updateSliceGeometry(slice);
             if (m_animation)
                 presenter()->startAnimation(m_animation->updateValue(sliceItem, sliceData));
             else
@@ -167,7 +167,7 @@ void PieChartItem::updateLayout()
     update();
 }
 
-void PieChartItem::handleSlicesAdded(QList<QPieSlice *> slices)
+void PieChartItem::handleSlicesAdded(const QList<QPieSlice *> &slices)
 {
     // delay creating slice items until there is a proper rectangle
     if (!m_rect.isValid() && m_sliceItems.isEmpty())
@@ -177,7 +177,7 @@ void PieChartItem::handleSlicesAdded(QList<QPieSlice *> slices)
 
     bool startupAnimation = m_sliceItems.isEmpty();
 
-    foreach(QPieSlice * slice, slices) {
+    for (auto *slice : slices) {
         PieSliceItem *sliceItem = new PieSliceItem(this);
         m_sliceItems.insert(slice, sliceItem);
 
@@ -210,11 +210,11 @@ void PieChartItem::handleSlicesAdded(QList<QPieSlice *> slices)
     }
 }
 
-void PieChartItem::handleSlicesRemoved(QList<QPieSlice *> slices)
+void PieChartItem::handleSlicesRemoved(const QList<QPieSlice *> &slices)
 {
     themeManager()->updateSeries(m_series);
 
-    foreach (QPieSlice *slice, slices) {
+    for (auto *slice : slices) {
 
         PieSliceItem *sliceItem = m_sliceItems.value(slice);
 
diff --git a/src/charts/piechart/piechartitem_p.h b/src/charts/piechart/piechartitem_p.h
index 72ef1a88..41f59ace 100644
--- a/src/charts/piechart/piechartitem_p.h
+++ b/src/charts/piechart/piechartitem_p.h
@@ -78,8 +78,8 @@ public Q_SLOTS:
     void handleDomainUpdated() override;
 
     void updateLayout();
-    void handleSlicesAdded(QList<QPieSlice *> slices);
-    void handleSlicesRemoved(QList<QPieSlice *> slices);
+    void handleSlicesAdded(const QList<QPieSlice *> &slices);
+    void handleSlicesRemoved(const QList<QPieSlice *> &slices);
     void handleSliceChanged();
     void handleSeriesVisibleChanged();
     void handleOpacityChanged();
diff --git a/src/charts/piechart/qpiemodelmapper.cpp b/src/charts/piechart/qpiemodelmapper.cpp
index d01c706e..6390cd7f 100644
--- a/src/charts/piechart/qpiemodelmapper.cpp
+++ b/src/charts/piechart/qpiemodelmapper.cpp
@@ -291,7 +291,7 @@ bool QPieModelMapperPrivate::isValueIndex(QModelIndex index) const
     return false;
 }
 
-void QPieModelMapperPrivate::slicesAdded(QList<QPieSlice *> slices)
+void QPieModelMapperPrivate::slicesAdded(const QList<QPieSlice *> &slices)
 {
     if (m_seriesSignalsBlock)
         return;
@@ -325,7 +325,7 @@ void QPieModelMapperPrivate::slicesAdded(QList<QPieSlice *> slices)
     blockModelSignals(false);
 }
 
-void QPieModelMapperPrivate::slicesRemoved(QList<QPieSlice *> slices)
+void QPieModelMapperPrivate::slicesRemoved(const QList<QPieSlice *> &slices)
 {
     if (m_seriesSignalsBlock)
         return;
diff --git a/src/charts/piechart/qpiemodelmapper_p.h b/src/charts/piechart/qpiemodelmapper_p.h
index 892938ea..6fab705f 100644
--- a/src/charts/piechart/qpiemodelmapper_p.h
+++ b/src/charts/piechart/qpiemodelmapper_p.h
@@ -68,8 +68,8 @@ public Q_SLOTS:
     void handleModelDestroyed();
 
     // for the series
-    void slicesAdded(QList<QPieSlice *> slices);
-    void slicesRemoved(QList<QPieSlice *> slices);
+    void slicesAdded(const QList<QPieSlice *> &slices);
+    void slicesRemoved(const QList<QPieSlice *> &slices);
     void sliceLabelChanged();
     void sliceValueChanged();
     void handleSeriesDestroyed();
diff --git a/src/charts/piechart/qpieseries.cpp b/src/charts/piechart/qpieseries.cpp
index 1dc6e0ec..f1bf5105 100644
--- a/src/charts/piechart/qpieseries.cpp
+++ b/src/charts/piechart/qpieseries.cpp
@@ -307,7 +307,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn void QPieSeries::added(QList<QPieSlice*> slices)
+    \fn void QPieSeries::added(const QList<QPieSlice*> &slices)
 
     This signal is emitted when the slices specified by \a slices are added to the series.
 
@@ -321,7 +321,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn void QPieSeries::removed(QList<QPieSlice*> slices)
+    \fn void QPieSeries::removed(const QList<QPieSlice*> &slices)
     This signal is emitted when the slices specified by \a slices are removed from the series.
     \sa remove()
 */
@@ -488,14 +488,14 @@ bool QPieSeries::append(QPieSlice *slice)
 
     Returns \c true if appending succeeds.
 */
-bool QPieSeries::append(QList<QPieSlice *> slices)
+bool QPieSeries::append(const QList<QPieSlice *> &slices)
 {
     Q_D(QPieSeries);
 
     if (slices.count() == 0)
         return false;
 
-    foreach (QPieSlice *s, slices) {
+    for (auto *s : slices) {
         if (!s || d->m_slices.contains(s))
             return false;
         if (s->series()) // already added to some series
@@ -504,7 +504,7 @@ bool QPieSeries::append(QList<QPieSlice *> slices)
             return false;
     }
 
-    foreach (QPieSlice *s, slices) {
+    for (auto *s : slices) {
         s->setParent(this);
         QPieSlicePrivate::fromSlice(s)->m_series = this;
         d->m_slices << s;
@@ -512,7 +512,7 @@ bool QPieSeries::append(QList<QPieSlice *> slices)
 
     d->updateDerivativeData();
 
-    foreach(QPieSlice * s, slices) {
+    for (auto *s : slices) {
         connect(s, SIGNAL(valueChanged()), d, SLOT(sliceValueChanged()));
         connect(s, SIGNAL(clicked()), d, SLOT(sliceClicked()));
         connect(s, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool)));
@@ -544,7 +544,7 @@ QPieSeries &QPieSeries::operator << (QPieSlice *slice)
     Returns null if \a value is \c NaN, \c Inf, or \c -Inf and adds nothing to the
     series.
 */
-QPieSlice *QPieSeries::append(QString label, qreal value)
+QPieSlice *QPieSeries::append(const QString &label, qreal value)
 {
     if (isValidValue(value)) {
         QPieSlice *slice = new QPieSlice(label, value);
@@ -896,7 +896,7 @@ void QPieSeriesPrivate::updateDerivativeData()
     // update slice attributes
     qreal sliceAngle = m_pieStartAngle;
     qreal pieSpan = m_pieEndAngle - m_pieStartAngle;
-    QVector<QPieSlice *> changed;
+    QList<QPieSlice *> changed;
     foreach (QPieSlice *s, m_slices) {
         QPieSlicePrivate *d = QPieSlicePrivate::fromSlice(s);
         d->setPercentage(s->value() / m_sum);
diff --git a/src/charts/piechart/qpieseries.h b/src/charts/piechart/qpieseries.h
index 091d68c4..e82a9d7a 100644
--- a/src/charts/piechart/qpieseries.h
+++ b/src/charts/piechart/qpieseries.h
@@ -55,9 +55,9 @@ public:
     QAbstractSeries::SeriesType type() const override;
 
     bool append(QPieSlice *slice);
-    bool append(QList<QPieSlice *> slices);
+    bool append(const QList<QPieSlice *> &slices);
     QPieSeries &operator << (QPieSlice *slice);
-    QPieSlice *append(QString label, qreal value);
+    QPieSlice *append(const QString &label, qreal value);
 
     bool insert(int index, QPieSlice *slice);
 
@@ -94,8 +94,8 @@ public:
     void setLabelsPosition(QPieSlice::LabelPosition position);
 
 Q_SIGNALS:
-    void added(QList<QPieSlice *> slices);
-    void removed(QList<QPieSlice *> slices);
+    void added(const QList<QPieSlice *> &slices);
+    void removed(const QList<QPieSlice *> &slices);
     void clicked(QPieSlice *slice);
     void hovered(QPieSlice *slice, bool state);
     void pressed(QPieSlice *slice);
diff --git a/src/charts/scatterchart/scatterchartitem.cpp b/src/charts/scatterchart/scatterchartitem.cpp
index a358e4f2..c9b6d301 100644
--- a/src/charts/scatterchart/scatterchartitem.cpp
+++ b/src/charts/scatterchart/scatterchartitem.cpp
@@ -153,7 +153,7 @@ void ScatterChartItem::updateGeometry()
         return;
     }
 
-    const QVector<QPointF>& points = geometryPoints();
+    const QList<QPointF> &points = geometryPoints();
 
     if (points.size() == 0) {
         deletePoints(m_items.childItems().count());
@@ -178,7 +178,7 @@ void ScatterChartItem::updateGeometry()
     // a region that has to be compatible with QRect.
     if (clipRect.height() <= INT_MAX
             && clipRect.width() <= INT_MAX) {
-        QVector<bool> offGridStatus = offGridStatusVector();
+        const QList<bool> offGridStatus = offGridStatusVector();
         const int seriesLastIndex = m_series->count() - 1;
 
         for (int i = 0; i < points.size(); i++) {
diff --git a/src/charts/splinechart/splinechartitem.cpp b/src/charts/splinechart/splinechartitem.cpp
index 776842fd..94a66906 100644
--- a/src/charts/splinechart/splinechartitem.cpp
+++ b/src/charts/splinechart/splinechartitem.cpp
@@ -86,19 +86,20 @@ ChartAnimation *SplineChartItem::animation() const
     return m_animation;
 }
 
-void SplineChartItem::setControlGeometryPoints(QVector<QPointF>& points)
+void SplineChartItem::setControlGeometryPoints(const QList<QPointF> &points)
 {
     m_controlPoints = points;
 }
 
-QVector<QPointF> SplineChartItem::controlGeometryPoints() const
+QList<QPointF> SplineChartItem::controlGeometryPoints() const
 {
     return m_controlPoints;
 }
 
-void SplineChartItem::updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index)
+void SplineChartItem::updateChart(const QList<QPointF> &oldPoints, const QList<QPointF> &newPoints,
+                                  int index)
 {
-    QVector<QPointF> controlPoints;
+    QList<QPointF> controlPoints;
     if (newPoints.count() >= 2)
         controlPoints = calculateControlPoints(newPoints);
 
@@ -117,8 +118,8 @@ void SplineChartItem::updateChart(QVector<QPointF> &oldPoints, QVector<QPointF>
 
 void SplineChartItem::updateGeometry()
 {
-    const QVector<QPointF> &points = m_points;
-    const QVector<QPointF> &controlPoints = m_controlPoints;
+    const QList<QPointF> &points = m_points;
+    const QList<QPointF> &controlPoints = m_controlPoints;
 
     if ((points.size() < 2) || (controlPoints.size() < 2)) {
         prepareGeometryChange();
@@ -319,9 +320,9 @@ void SplineChartItem::updateGeometry()
 /*!
   Calculates control points which are needed by QPainterPath.cubicTo function to draw the cubic Bezier cureve between two points.
   */
-QVector<QPointF> SplineChartItem::calculateControlPoints(const QVector<QPointF> &points)
+QList<QPointF> SplineChartItem::calculateControlPoints(const QList<QPointF> &points)
 {
-    QVector<QPointF> controlPoints;
+    QList<QPointF> controlPoints;
     controlPoints.resize(points.count() * 2 - 2);
 
     int n = points.count() - 1;
@@ -347,27 +348,26 @@ QVector<QPointF> SplineChartItem::calculateControlPoints(const QVector<QPointF>
     //  |   0   0   0   0   0   0   0   0   ... 1   4   1   |   |   P1_(n-1)|   |   4 * P(n-2) + 2 * P(n-1) |
     //  |   0   0   0   0   0   0   0   0   ... 0   2   7   |   |   P1_n    |   |   8 * P(n-1) + Pn         |
     //
-    QVector<qreal> vector;
-    vector.resize(n);
-
-    vector[0] = points[0].x() + 2 * points[1].x();
+    QList<qreal> list;
+    list.resize(n);
 
+    list[0] = points[0].x() + 2 * points[1].x();
 
     for (int i = 1; i < n - 1; ++i)
-        vector[i] = 4 * points[i].x() + 2 * points[i + 1].x();
+        list[i] = 4 * points[i].x() + 2 * points[i + 1].x();
 
-    vector[n - 1] = (8 * points[n - 1].x() + points[n].x()) / 2.0;
+    list[n - 1] = (8 * points[n - 1].x() + points[n].x()) / 2.0;
 
-    QVector<qreal> xControl = firstControlPoints(vector);
+    const QList<qreal> xControl = firstControlPoints(list);
 
-    vector[0] = points[0].y() + 2 * points[1].y();
+    list[0] = points[0].y() + 2 * points[1].y();
 
     for (int i = 1; i < n - 1; ++i)
-        vector[i] = 4 * points[i].y() + 2 * points[i + 1].y();
+        list[i] = 4 * points[i].y() + 2 * points[i + 1].y();
 
-    vector[n - 1] = (8 * points[n - 1].y() + points[n].y()) / 2.0;
+    list[n - 1] = (8 * points[n - 1].y() + points[n].y()) / 2.0;
 
-    QVector<qreal> yControl = firstControlPoints(vector);
+    const QList<qreal> yControl = firstControlPoints(list);
 
     for (int i = 0, j = 0; i < n; ++i, ++j) {
 
@@ -387,15 +387,15 @@ QVector<QPointF> SplineChartItem::calculateControlPoints(const QVector<QPointF>
     return controlPoints;
 }
 
-QVector<qreal> SplineChartItem::firstControlPoints(const QVector<qreal>& vector)
+QList<qreal> SplineChartItem::firstControlPoints(const QList<qreal> &list)
 {
-    QVector<qreal> result;
+    QList<qreal> result;
 
-    int count = vector.count();
+    int count = list.count();
     result.resize(count);
-    result[0] = vector[0] / 2.0;
+    result[0] = list[0] / 2.0;
 
-    QVector<qreal> temp;
+    QList<qreal> temp;
     temp.resize(count);
     temp[0] = 0;
 
@@ -404,7 +404,7 @@ QVector<qreal> SplineChartItem::firstControlPoints(const QVector<qreal>& vector)
     for (int i = 1; i < count; i++) {
         temp[i] = 1 / b;
         b = (i < count - 1 ? 4.0 : 3.5) - temp[i];
-        result[i] = (vector[i] - result[i - 1]) / b;
+        result[i] = (list[i] - result[i - 1]) / b;
     }
 
     for (int i = 1; i < count; i++)
diff --git a/src/charts/splinechart/splinechartitem_p.h b/src/charts/splinechart/splinechartitem_p.h
index e8055e0d..dc0a2d31 100644
--- a/src/charts/splinechart/splinechartitem_p.h
+++ b/src/charts/splinechart/splinechartitem_p.h
@@ -59,8 +59,8 @@ public:
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
     QPainterPath shape() const override;
 
-    void setControlGeometryPoints(QVector<QPointF>& points);
-    QVector<QPointF> controlGeometryPoints() const;
+    void setControlGeometryPoints(const QList<QPointF> &points);
+    QList<QPointF> controlGeometryPoints() const;
 
     void setAnimation(SplineAnimation *animation);
     ChartAnimation *animation() const override;
@@ -70,9 +70,9 @@ public Q_SLOTS:
 
 protected:
     void updateGeometry() override;
-    QVector<QPointF> calculateControlPoints(const QVector<QPointF> &points);
-    QVector<qreal> firstControlPoints(const QVector<qreal>& vector);
-    void updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index) override;
+    QList<QPointF> calculateControlPoints(const QList<QPointF> &points);
+    QList<qreal> firstControlPoints(const QList<qreal> &list);
+    void updateChart(const QList<QPointF> &oldPoints, const QList<QPointF> &newPoints, int index) override;
     void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
     void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
     void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
@@ -89,8 +89,8 @@ private:
     QPen m_linePen;
     QPen m_pointPen;
     bool m_pointsVisible;
-    QVector<QPointF> m_controlPoints;
-    QVector<QPointF> m_visiblePoints;
+    QList<QPointF> m_controlPoints;
+    QList<QPointF> m_visiblePoints;
     SplineAnimation *m_animation;
 
     bool m_pointLabelsVisible;
diff --git a/src/charts/xychart/glxyseriesdata.cpp b/src/charts/xychart/glxyseriesdata.cpp
index 8ec919b7..5385a2b2 100644
--- a/src/charts/xychart/glxyseriesdata.cpp
+++ b/src/charts/xychart/glxyseriesdata.cpp
@@ -74,7 +74,7 @@ void GLXYSeriesDataManager::setPoints(QXYSeries *series, const AbstractDomain *d
         m_seriesDataMap.insert(series, data);
         m_mapDirty = true;
     }
-    QVector<float> &array = data->array;
+    QList<float> &array = data->array;
 
     bool logAxis = false;
     bool reverseX = false;
@@ -99,7 +99,7 @@ void GLXYSeriesDataManager::setPoints(QXYSeries *series, const AbstractDomain *d
     QMatrix4x4 matrix;
     if (logAxis) {
         // Use domain to resolve geometry points. Not as fast as shaders, but simpler that way
-        QVector<QPointF> geometryPoints = domain->calculateGeometryPoints(series->pointsVector());
+        QList<QPointF> geometryPoints = domain->calculateGeometryPoints(series->points());
         const float height = domain->size().height();
         if (geometryPoints.size()) {
             for (int i = 0; i < count; i++) {
@@ -129,7 +129,7 @@ void GLXYSeriesDataManager::setPoints(QXYSeries *series, const AbstractDomain *d
         const qreal yd = domain->maxY() - my;
 
         if (!qFuzzyIsNull(xd) && !qFuzzyIsNull(yd)) {
-            const QVector<QPointF> seriesPoints = series->pointsVector();
+            const QList<QPointF> seriesPoints = series->points();
             for (const QPointF &point : seriesPoints) {
                 array[index++] = float((point.x() - mx) / xd);
                 array[index++] = float((point.y() - my) / yd);
diff --git a/src/charts/xychart/glxyseriesdata_p.h b/src/charts/xychart/glxyseriesdata_p.h
index 2db3e490..ba2a5538 100644
--- a/src/charts/xychart/glxyseriesdata_p.h
+++ b/src/charts/xychart/glxyseriesdata_p.h
@@ -52,7 +52,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 class AbstractDomain;
 
 struct GLXYSeriesData {
-    QVector<float> array;
+    QList<float> array;
     bool dirty;
     QVector3D color;
     float width;
diff --git a/src/charts/xychart/qxyseries.cpp b/src/charts/xychart/qxyseries.cpp
index 3f630bed..e39ec688 100644
--- a/src/charts/xychart/qxyseries.cpp
+++ b/src/charts/xychart/qxyseries.cpp
@@ -599,7 +599,7 @@ void QXYSeries::replace(int index, const QPointF &newPoint)
   when the points have been replaced.
   \sa pointsReplaced()
 */
-void QXYSeries::replace(QVector<QPointF> points)
+void QXYSeries::replace(const QList<QPointF> &points)
 {
     Q_D(QXYSeries);
     d->m_points = points;
@@ -681,28 +681,32 @@ void QXYSeries::clear()
 }
 
 /*!
-    Returns the points in the series as a list.
-    Use pointsVector() for better performance.
+    Returns the points in the series.
 */
 QList<QPointF> QXYSeries::points() const
 {
     Q_D(const QXYSeries);
-    return d->m_points.toList();
+    return d->m_points;
 }
 
+#if QT_DEPRECATED_SINCE(6, 0)
 /*!
-    Returns the points in the series as a vector.
-    This is more efficient than calling points().
+    \obsolete
+
+    Use points() instead.
+    Returns the points in the series.
+
 */
-QVector<QPointF> QXYSeries::pointsVector() const
+QList<QPointF> QXYSeries::pointsVector() const
 {
     Q_D(const QXYSeries);
     return d->m_points;
 }
+#endif
 
 /*!
     Returns the data point at the position specified by \a index in the internal
-    points vector.
+    series of points.
 */
 const QPointF &QXYSeries::at(int index) const
 {
@@ -925,7 +929,7 @@ void QXYSeriesPrivate::initializeDomain()
 
     Q_Q(QXYSeries);
 
-    const QVector<QPointF> &points = q->pointsVector();
+    const QList<QPointF> &points = q->points();
 
     if (!points.isEmpty()) {
         minX = points[0].x();
@@ -985,7 +989,7 @@ void QXYSeriesPrivate::initializeAnimations(QtCharts::QChart::AnimationOptions o
     QAbstractSeriesPrivate::initializeAnimations(options, duration, curve);
 }
 
-void QXYSeriesPrivate::drawSeriesPointLabels(QPainter *painter, const QVector<QPointF> &points,
+void QXYSeriesPrivate::drawSeriesPointLabels(QPainter *painter, const QList<QPointF> &points,
                                              const int offset)
 {
     if (points.size() == 0)
diff --git a/src/charts/xychart/qxyseries.h b/src/charts/xychart/qxyseries.h
index 6f8b64f9..55313beb 100644
--- a/src/charts/xychart/qxyseries.h
+++ b/src/charts/xychart/qxyseries.h
@@ -76,7 +76,10 @@ public:
 
     int count() const;
     QList<QPointF> points() const;
-    QVector<QPointF> pointsVector() const;
+#if QT_DEPRECATED_SINCE(6, 0)
+    QT_DEPRECATED_X("Use points() instead")
+    QList<QPointF> pointsVector() const;
+#endif
     const QPointF &at(int index) const;
 
     QXYSeries &operator << (const QPointF &point);
@@ -109,7 +112,7 @@ public:
     void setPointLabelsClipping(bool enabled = true);
     bool pointLabelsClipping() const;
 
-    void replace(QVector<QPointF> points);
+    void replace(const QList<QPointF> &points);
 
 Q_SIGNALS:
     void clicked(const QPointF &point);
diff --git a/src/charts/xychart/qxyseries_p.h b/src/charts/xychart/qxyseries_p.h
index e9ac877e..1cc1e771 100644
--- a/src/charts/xychart/qxyseries_p.h
+++ b/src/charts/xychart/qxyseries_p.h
@@ -64,14 +64,14 @@ public:
     QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const override;
     QAbstractAxis* createDefaultAxis(Qt::Orientation orientation) const override;
 
-    void drawSeriesPointLabels(QPainter *painter, const QVector<QPointF> &points,
+    void drawSeriesPointLabels(QPainter *painter, const QList<QPointF> &points,
                                const int offset = 0);
 
 Q_SIGNALS:
     void updated();
 
 protected:
-    QVector<QPointF> m_points;
+    QList<QPointF> m_points;
     QPen m_pen;
     QBrush m_brush;
     bool m_pointsVisible;
diff --git a/src/charts/xychart/xychart.cpp b/src/charts/xychart/xychart.cpp
index 2b82d6d5..7e867a49 100644
--- a/src/charts/xychart/xychart.cpp
+++ b/src/charts/xychart/xychart.cpp
@@ -62,7 +62,7 @@ XYChart::XYChart(QXYSeries *series, QGraphicsItem *item):
                      this, &XYChart::handleDomainUpdated);
 }
 
-void XYChart::setGeometryPoints(const QVector<QPointF> &points)
+void XYChart::setGeometryPoints(const QList<QPointF> &points)
 {
     m_points = points;
 }
@@ -77,16 +77,16 @@ void XYChart::setDirty(bool dirty)
     m_dirty = dirty;
 }
 
-// Returns a vector with same size as geometryPoints vector, indicating
+// Returns a list with same size as geometryPoints list, indicating
 // the off grid status of points.
-QVector<bool> XYChart::offGridStatusVector()
+QList<bool> XYChart::offGridStatusVector()
 {
     qreal minX = domain()->minX();
     qreal maxX = domain()->maxX();
     qreal minY = domain()->minY();
     qreal maxY = domain()->maxY();
 
-    QVector<bool> returnVector;
+    QList<bool> returnVector;
     returnVector.resize(m_points.size());
     // During remove animation series may have different number of points,
     // so ensure we don't go over the index. No need to check for zero points, this
@@ -107,7 +107,8 @@ QVector<bool> XYChart::offGridStatusVector()
     return returnVector;
 }
 
-void XYChart::updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index)
+void XYChart::updateChart(const QList<QPointF> &oldPoints, const QList<QPointF> &newPoints,
+                          int index)
 {
 
     if (m_animation) {
@@ -145,13 +146,13 @@ void XYChart::handlePointAdded(int index)
     if (m_series->useOpenGL()) {
         updateGlChart();
     } else {
-        QVector<QPointF> points;
+        QList<QPointF> points;
         if (m_dirty || m_points.isEmpty()) {
-            points = domain()->calculateGeometryPoints(m_series->pointsVector());
+            points = domain()->calculateGeometryPoints(m_series->points());
         } else {
             points = m_points;
-            QPointF point = domain()->calculateGeometryPoint(m_series->pointsVector().at(index),
-                                                             m_validData);
+            QPointF point =
+                    domain()->calculateGeometryPoint(m_series->points().at(index), m_validData);
             if (!m_validData)
                 m_points.clear();
             else
@@ -169,9 +170,9 @@ void XYChart::handlePointRemoved(int index)
     if (m_series->useOpenGL()) {
         updateGlChart();
     } else {
-        QVector<QPointF> points;
+        QList<QPointF> points;
         if (m_dirty || m_points.isEmpty()) {
-            points = domain()->calculateGeometryPoints(m_series->pointsVector());
+            points = domain()->calculateGeometryPoints(m_series->points());
         } else {
             points = m_points;
             points.remove(index);
@@ -188,9 +189,9 @@ void XYChart::handlePointsRemoved(int index, int count)
     if (m_series->useOpenGL()) {
         updateGlChart();
     } else {
-        QVector<QPointF> points;
+        QList<QPointF> points;
         if (m_dirty || m_points.isEmpty()) {
-            points = domain()->calculateGeometryPoints(m_series->pointsVector());
+            points = domain()->calculateGeometryPoints(m_series->points());
         } else {
             points = m_points;
             points.remove(index, count);
@@ -207,12 +208,12 @@ void XYChart::handlePointReplaced(int index)
     if (m_series->useOpenGL()) {
         updateGlChart();
     } else {
-        QVector<QPointF> points;
+        QList<QPointF> points;
         if (m_dirty || m_points.isEmpty()) {
-            points = domain()->calculateGeometryPoints(m_series->pointsVector());
+            points = domain()->calculateGeometryPoints(m_series->points());
         } else {
-            QPointF point = domain()->calculateGeometryPoint(m_series->pointsVector().at(index),
-                                                             m_validData);
+            QPointF point =
+                    domain()->calculateGeometryPoint(m_series->points().at(index), m_validData);
             if (!m_validData)
                 m_points.clear();
             points = m_points;
@@ -229,7 +230,7 @@ void XYChart::handlePointsReplaced()
         updateGlChart();
     } else {
         // All the points were replaced -> recalculate
-        QVector<QPointF> points = domain()->calculateGeometryPoints(m_series->pointsVector());
+        QList<QPointF> points = domain()->calculateGeometryPoints(m_series->points());
         updateChart(m_points, points, -1);
     }
 }
@@ -240,7 +241,7 @@ void XYChart::handleDomainUpdated()
         updateGlChart();
     } else {
         if (isEmpty()) return;
-        QVector<QPointF> points = domain()->calculateGeometryPoints(m_series->pointsVector());
+        QList<QPointF> points = domain()->calculateGeometryPoints(m_series->points());
         updateChart(m_points, points);
     }
 }
diff --git a/src/charts/xychart/xychart_p.h b/src/charts/xychart/xychart_p.h
index 95c07c3a..72be4f94 100644
--- a/src/charts/xychart/xychart_p.h
+++ b/src/charts/xychart/xychart_p.h
@@ -58,8 +58,8 @@ public:
     explicit XYChart(QXYSeries *series,QGraphicsItem *item = 0);
     ~XYChart() {}
 
-    void setGeometryPoints(const QVector<QPointF> &points);
-    QVector<QPointF> geometryPoints() const { return m_points; }
+    void setGeometryPoints(const QList<QPointF> &points);
+    QList<QPointF> geometryPoints() const { return m_points; }
 
     void setAnimation(XYAnimation *animation);
     ChartAnimation *animation() const override { return m_animation; }
@@ -69,7 +69,7 @@ public:
     void setDirty(bool dirty);
 
     void getSeriesRanges(qreal &minX, qreal &maxX, qreal &minY, qreal &maxY);
-    QVector<bool> offGridStatusVector();
+    QList<bool> offGridStatusVector();
 
 public Q_SLOTS:
     void handlePointAdded(int index);
@@ -87,7 +87,8 @@ Q_SIGNALS:
     void doubleClicked(const QPointF &point);
 
 protected:
-    virtual void updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index = -1);
+    virtual void updateChart(const QList<QPointF> &oldPoints, const QList<QPointF> &newPoints,
+                             int index = -1);
     virtual void updateGlChart();
     virtual void refreshGlChart();
 
@@ -96,7 +97,7 @@ private:
 
 protected:
     QXYSeries *m_series;
-    QVector<QPointF> m_points;
+    QList<QPointF> m_points;
     XYAnimation *m_animation;
     bool m_dirty;
 
diff --git a/src/chartsqml2/declarativeabstractrendernode_p.h b/src/chartsqml2/declarativeabstractrendernode_p.h
index 1ee307f6..2d6b85d2 100644
--- a/src/chartsqml2/declarativeabstractrendernode_p.h
+++ b/src/chartsqml2/declarativeabstractrendernode_p.h
@@ -81,8 +81,8 @@ public:
     virtual void setRect(const QRectF &rect) = 0;
     virtual void setSeriesData(bool mapDirty, const GLXYDataMap &dataMap) = 0;
     virtual void setAntialiasing(bool enable) = 0;
-    virtual void addMouseEvents(const QVector<QMouseEvent *> &events) = 0;
-    virtual void takeMouseEventResponses(QVector<MouseEventResponse> &responses) = 0;
+    virtual void addMouseEvents(const QList<QMouseEvent *> &events) = 0;
+    virtual void takeMouseEventResponses(QList<MouseEventResponse> &responses) = 0;
 };
 
 QT_CHARTS_END_NAMESPACE
diff --git a/src/chartsqml2/declarativebarseries.cpp b/src/chartsqml2/declarativebarseries.cpp
index f8197820..d76930a0 100644
--- a/src/chartsqml2/declarativebarseries.cpp
+++ b/src/chartsqml2/declarativebarseries.cpp
@@ -87,7 +87,7 @@ void DeclarativeBarSet::setValues(QVariantList values)
             }
         }
 
-        QVector<qreal> indexValueList;
+        QList<qreal> indexValueList;
         indexValueList.resize(maxValue + 1);
 
         for (int i = 0; i < values.count(); i++) {
diff --git a/src/chartsqml2/declarativechart.cpp b/src/chartsqml2/declarativechart.cpp
index 6cb811aa..350ab295 100644
--- a/src/chartsqml2/declarativechart.cpp
+++ b/src/chartsqml2/declarativechart.cpp
@@ -771,7 +771,7 @@ QSGNode *DeclarativeChart::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdateP
     return node;
 }
 
-void DeclarativeChart::sceneChanged(QList<QRectF> region)
+void DeclarativeChart::sceneChanged(const QList<QRectF> &region)
 {
     const int count = region.size();
     const qreal limitSize = 0.01;
diff --git a/src/chartsqml2/declarativechart_p.h b/src/chartsqml2/declarativechart_p.h
index 589b77b0..ecabdc23 100644
--- a/src/chartsqml2/declarativechart_p.h
+++ b/src/chartsqml2/declarativechart_p.h
@@ -137,7 +137,7 @@ protected:
     void mouseDoubleClickEvent(QMouseEvent *event) override;
 private Q_SLOTS:
     void handleAntialiasingChanged(bool enable);
-    void sceneChanged(QList<QRectF> region);
+    void sceneChanged(const QList<QRectF> &region);
     void renderScene();
 
 public:
@@ -268,8 +268,8 @@ private:
     DeclarativeMargins *m_margins;
     GLXYSeriesDataManager *m_glXYDataManager;
     bool m_sceneImageNeedsClear;
-    QVector<QMouseEvent *> m_pendingRenderNodeMouseEvents;
-    QVector<MouseEventResponse> m_pendingRenderNodeMouseEventResponses;
+    QList<QMouseEvent *> m_pendingRenderNodeMouseEvents;
+    QList<MouseEventResponse> m_pendingRenderNodeMouseEventResponses;
     QRectF m_adjustedPlotArea;
 };
 
diff --git a/src/chartsqml2/declarativeopenglrendernode.cpp b/src/chartsqml2/declarativeopenglrendernode.cpp
index c627daa3..1b975fc8 100644
--- a/src/chartsqml2/declarativeopenglrendernode.cpp
+++ b/src/chartsqml2/declarativeopenglrendernode.cpp
@@ -276,7 +276,7 @@ void DeclarativeOpenGLRenderNode::setAntialiasing(bool enable)
     }
 }
 
-void DeclarativeOpenGLRenderNode::addMouseEvents(const QVector<QMouseEvent *> &events)
+void DeclarativeOpenGLRenderNode::addMouseEvents(const QList<QMouseEvent *> &events)
 {
     if (events.size()) {
         m_mouseEvents.append(events);
@@ -284,7 +284,7 @@ void DeclarativeOpenGLRenderNode::addMouseEvents(const QVector<QMouseEvent *> &e
     }
 }
 
-void DeclarativeOpenGLRenderNode::takeMouseEventResponses(QVector<MouseEventResponse> &responses)
+void DeclarativeOpenGLRenderNode::takeMouseEventResponses(QList<MouseEventResponse> &responses)
 {
     responses.append(m_mouseEventResponses);
     m_mouseEventResponses.clear();
@@ -309,7 +309,7 @@ void DeclarativeOpenGLRenderNode::renderGL(bool selection)
 
         if (data->visible) {
             if (selection) {
-                m_selectionVector[counter] = i.key();
+                m_selectionList[counter] = i.key();
                 m_program->setUniformValue(m_colorUniformLoc, QVector3D((counter & 0xff) / 255.0f,
                                                                         ((counter & 0xff00) >> 8) / 255.0f,
                                                                         ((counter & 0xff0000) >> 16) / 255.0f));
@@ -349,7 +349,7 @@ void DeclarativeOpenGLRenderNode::renderSelection()
 {
     m_selectionFbo->bind();
 
-    m_selectionVector.resize(m_xyDataMap.size());
+    m_selectionList.resize(m_xyDataMap.size());
 
     renderGL(true);
 
@@ -520,8 +520,8 @@ const QXYSeries *DeclarativeOpenGLRenderNode::findSeriesAtEvent(QMouseEvent *eve
             index = pixel[0] + (pixel[1] << 8) + (pixel[2] << 16);
     }
 
-    if (index >= 0 && index < m_selectionVector.size())
-        series = m_selectionVector.at(index);
+    if (index >= 0 && index < m_selectionList.size())
+        series = m_selectionList.at(index);
 
     return series;
 }
diff --git a/src/chartsqml2/declarativeopenglrendernode_p.h b/src/chartsqml2/declarativeopenglrendernode_p.h
index ef91f9fd..56a1b097 100644
--- a/src/chartsqml2/declarativeopenglrendernode_p.h
+++ b/src/chartsqml2/declarativeopenglrendernode_p.h
@@ -67,8 +67,8 @@ public:
     void setSeriesData(bool mapDirty, const GLXYDataMap &dataMap) override;
     void setRect(const QRectF &rect) override;
     void setAntialiasing(bool enable) override;
-    void addMouseEvents(const QVector<QMouseEvent *> &events) override;
-    void takeMouseEventResponses(QVector<MouseEventResponse> &responses) override;
+    void addMouseEvents(const QList<QMouseEvent *> &events) override;
+    void takeMouseEventResponses(QList<MouseEventResponse> &responses) override;
 
 public Q_SLOTS:
     void render();
@@ -104,10 +104,10 @@ private:
     bool m_renderNeeded;
     QRectF m_rect;
     bool m_antialiasing;
-    QVector<QMouseEvent *> m_mouseEvents;
-    QVector<MouseEventResponse> m_mouseEventResponses;
+    QList<QMouseEvent *> m_mouseEvents;
+    QList<MouseEventResponse> m_mouseEventResponses;
     bool m_selectionRenderNeeded;
-    QVector<const QXYSeries *> m_selectionVector;
+    QList<const QXYSeries *> m_selectionList;
     QPoint m_mousePressPos;
     bool m_mousePressed;
     const QXYSeries *m_lastPressSeries;
diff --git a/src/chartsqml2/declarativepieseries.cpp b/src/chartsqml2/declarativepieseries.cpp
index 72586b48..3950fa70 100644
--- a/src/chartsqml2/declarativepieseries.cpp
+++ b/src/chartsqml2/declarativepieseries.cpp
@@ -146,15 +146,15 @@ void DeclarativePieSeries::clear()
     QPieSeries::clear();
 }
 
-void DeclarativePieSeries::handleAdded(QList<QPieSlice *> slices)
+void DeclarativePieSeries::handleAdded(const QList<QPieSlice *> &slices)
 {
-    foreach (QPieSlice *slice, slices)
+    for (auto *slice : slices)
         emit sliceAdded(slice);
 }
 
-void DeclarativePieSeries::handleRemoved(QList<QPieSlice *> slices)
+void DeclarativePieSeries::handleRemoved(const QList<QPieSlice *> &slices)
 {
-    foreach (QPieSlice *slice, slices)
+    for (auto *slice : slices)
         emit sliceRemoved(slice);
 }
 
diff --git a/src/chartsqml2/declarativepieseries_p.h b/src/chartsqml2/declarativepieseries_p.h
index 51776aee..4cf54057 100644
--- a/src/chartsqml2/declarativepieseries_p.h
+++ b/src/chartsqml2/declarativepieseries_p.h
@@ -95,8 +95,8 @@ Q_SIGNALS:
 
 public Q_SLOTS:
     static void appendSeriesChildren(QQmlListProperty<QObject> *list, QObject *element);
-    void handleAdded(QList<QPieSlice *> slices);
-    void handleRemoved(QList<QPieSlice *> slices);
+    void handleAdded(const QList<QPieSlice *> &slices);
+    void handleRemoved(const QList<QPieSlice *> &slices);
 };
 
 QT_CHARTS_END_NAMESPACE
diff --git a/tests/auto/qlineseries/tst_qlineseries.cpp b/tests/auto/qlineseries/tst_qlineseries.cpp
index f30e9682..016845fd 100644
--- a/tests/auto/qlineseries/tst_qlineseries.cpp
+++ b/tests/auto/qlineseries/tst_qlineseries.cpp
@@ -86,7 +86,6 @@ void tst_QLineSeries::qlineseries()
     QCOMPARE(series.count(),0);
     QCOMPARE(series.brush(), QBrush());
     QCOMPARE(series.points(), QList<QPointF>());
-    QCOMPARE(series.pointsVector(), QList<QPointF>());
     QCOMPARE(series.pen(), QPen());
     QCOMPARE(series.pointsVisible(), false);
     QCOMPARE(series.pointLabelsVisible(), false);
diff --git a/tests/auto/qscatterseries/tst_qscatterseries.cpp b/tests/auto/qscatterseries/tst_qscatterseries.cpp
index 5a5337d7..e91a881b 100644
--- a/tests/auto/qscatterseries/tst_qscatterseries.cpp
+++ b/tests/auto/qscatterseries/tst_qscatterseries.cpp
@@ -86,7 +86,6 @@ void tst_QScatterSeries::qscatterseries()
     QCOMPARE(series.count(),0);
     QCOMPARE(series.brush(), QBrush());
     QCOMPARE(series.points(), QList<QPointF>());
-    QCOMPARE(series.pointsVector(), QList<QPointF>());
     QCOMPARE(series.pen(), QPen());
     QCOMPARE(series.pointsVisible(), false);
 
diff --git a/tests/auto/qsplineseries/tst_qsplineseries.cpp b/tests/auto/qsplineseries/tst_qsplineseries.cpp
index ef5a536b..4fc437d8 100644
--- a/tests/auto/qsplineseries/tst_qsplineseries.cpp
+++ b/tests/auto/qsplineseries/tst_qsplineseries.cpp
@@ -84,7 +84,6 @@ void tst_QSplineSeries::qsplineseries()
     QCOMPARE(series.count(),0);
     QCOMPARE(series.brush(), QBrush());
     QCOMPARE(series.points(), QList<QPointF>());
-    QCOMPARE(series.pointsVector(), QList<QPointF>());
     QCOMPARE(series.pen(), QPen());
     QCOMPARE(series.pointsVisible(), false);
 
diff --git a/tests/auto/qxyseries/tst_qxyseries.cpp b/tests/auto/qxyseries/tst_qxyseries.cpp
index 07808989..ff366b0e 100644
--- a/tests/auto/qxyseries/tst_qxyseries.cpp
+++ b/tests/auto/qxyseries/tst_qxyseries.cpp
@@ -210,7 +210,6 @@ void tst_QXYSeries::append_raw()
     TRY_COMPARE(spy0.count(), 0);
     TRY_COMPARE(addedSpy.count(), points.count());
     QCOMPARE(m_series->points(), points);
-    QCOMPARE(m_series->pointsVector(), points.toVector());
 
     // Process events between appends
     foreach (const QPointF &point, otherPoints) {