Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I63ae7b0300c441821be3043d5a7a3621f3582cca

12 files changed, 212 insertions, 118 deletions

diff --git a/examples/charts/audio/widget.cpp b/examples/charts/audio/widget.cpp
index 86dd6206..70d2387c 100644
--- a/examples/charts/audio/widget.cpp
+++ b/examples/charts/audio/widget.cpp
@@ -57,8 +57,10 @@ Widget::Widget(const QAudioDeviceInfo &deviceInfo, QWidget *parent) :
     QValueAxis *axisY = new QValueAxis;
     axisY->setRange(-1, 1);
     axisY->setTitleText("Audio level");
-    m_chart->setAxisX(axisX, m_series);
-    m_chart->setAxisY(axisY, m_series);
+    m_chart->addAxis(axisX, Qt::AlignBottom);
+    m_series->attachAxis(axisX);
+    m_chart->addAxis(axisY, Qt::AlignLeft);
+    m_series->attachAxis(axisY);
     m_chart->legend()->hide();
     m_chart->setTitle("Data from the microphone (" + deviceInfo.deviceName() + ')');
 
diff --git a/src/charts/candlestickchart/qcandlestickseries.cpp b/src/charts/candlestickchart/qcandlestickseries.cpp
index b02bb5cd..8aefca54 100644
--- a/src/charts/candlestickchart/qcandlestickseries.cpp
+++ b/src/charts/candlestickchart/qcandlestickseries.cpp
@@ -553,7 +553,7 @@ bool QCandlestickSeries::remove(const QList<QCandlestickSet *> &sets)
         emit candlestickSetsRemoved(sets);
         emit countChanged();
         foreach (QCandlestickSet *set, sets)
-            set->deleteLater();
+            delete set;
     }
 
     return success;
@@ -630,7 +630,7 @@ void QCandlestickSeries::clear()
         emit candlestickSetsRemoved(sets);
         emit countChanged();
         foreach (QCandlestickSet *set, sets)
-            set->deleteLater();
+            delete set;
     }
 }
 
@@ -931,6 +931,7 @@ QCandlestickSeriesPrivate::QCandlestickSeriesPrivate(QCandlestickSeries *q)
 QCandlestickSeriesPrivate::~QCandlestickSeriesPrivate()
 {
     disconnect(this, 0, 0, 0);
+    qDeleteAll(m_sets);
 }
 
 void QCandlestickSeriesPrivate::initializeDomain()
diff --git a/src/charts/chartdataset.cpp b/src/charts/chartdataset.cpp
index 3fe0f2eb..4fec0ae1 100644
--- a/src/charts/chartdataset.cpp
+++ b/src/charts/chartdataset.cpp
@@ -421,7 +421,7 @@ void ChartDataSet::deleteAllSeries()
 {
     foreach (QAbstractSeries *s , m_seriesList){
         removeSeries(s);
-        s->deleteLater();
+        delete s;
     }
     Q_ASSERT(m_seriesList.count() == 0);
 }
@@ -430,7 +430,7 @@ void ChartDataSet::deleteAllAxes()
 {
     foreach (QAbstractAxis *a , m_axisList){
         removeAxis(a);
-        a->deleteLater();
+        delete a;
     }
     Q_ASSERT(m_axisList.count() == 0);
 }
diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
index d36af170..31a1b102 100644
--- a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
+++ b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
@@ -144,7 +144,8 @@ void tst_QAbstractAxis::axisPen()
     QCOMPARE(spy10.count(), 0);
     QCOMPARE(spy11.count(), 0);
 
-    m_chart->setAxisX(m_axis, m_series);
+    m_chart->addAxis(m_axis, Qt::AlignBottom);
+    m_series->attachAxis(m_axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     //TODO QCOMPARE(m_axis->axisPen(), axisPen);
@@ -203,7 +204,8 @@ void tst_QAbstractAxis::gridLinePen()
     QCOMPARE(spy10.count(), 0);
     QCOMPARE(spy11.count(), 0);
 
-    m_chart->setAxisX(m_axis, m_series);
+    m_chart->addAxis(m_axis, Qt::AlignBottom);
+    m_series->attachAxis(m_axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     //TODO QCOMPARE(m_axis->gridLinePen(), gridLinePen);
@@ -253,7 +255,8 @@ void tst_QAbstractAxis::minorGridLinePen()
     QCOMPARE(spy10.count(), 0);
     QCOMPARE(spy11.count(), 0);
 
-    m_chart->setAxisX(m_axis, m_series);
+    m_chart->addAxis(m_axis, Qt::AlignBottom);
+    m_series->attachAxis(m_axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
@@ -301,7 +304,8 @@ void tst_QAbstractAxis::lineVisible()
     QCOMPARE(spy10.count(), 0);
     QCOMPARE(spy11.count(), 0);
 
-    m_chart->setAxisX(m_axis, m_series);
+    m_chart->addAxis(m_axis, Qt::AlignBottom);
+    m_series->attachAxis(m_axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->isLineVisible(), lineVisible);
@@ -345,7 +349,8 @@ void tst_QAbstractAxis::gridLineVisible()
     QCOMPARE(spy8.count(), 0);
     QCOMPARE(spy9.count(), 0);
 
-    m_chart->setAxisX(m_axis, m_series);
+    m_chart->addAxis(m_axis, Qt::AlignBottom);
+    m_series->attachAxis(m_axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->isGridLineVisible(), gridLineVisible);
@@ -394,7 +399,8 @@ void tst_QAbstractAxis::minorGridLineVisible()
     QCOMPARE(spy10.count(), 0);
     QCOMPARE(spy11.count(), 0);
 
-    m_chart->setAxisX(m_axis, m_series);
+    m_chart->addAxis(m_axis, Qt::AlignBottom);
+    m_series->attachAxis(m_axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->isMinorGridLineVisible(), minorGridLineVisible);
@@ -442,7 +448,8 @@ void tst_QAbstractAxis::gridLineColor()
     QCOMPARE(spy10.count(), 1);
     QCOMPARE(spy11.count(), 0);
 
-    m_chart->setAxisX(m_axis, m_series);
+    m_chart->addAxis(m_axis, Qt::AlignBottom);
+    m_series->attachAxis(m_axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
@@ -489,7 +496,8 @@ void tst_QAbstractAxis::minorGridLineColor()
     QCOMPARE(spy10.count(), 0);
     QCOMPARE(spy11.count(), 1);
 
-    m_chart->setAxisX(m_axis, m_series);
+    m_chart->addAxis(m_axis, Qt::AlignBottom);
+    m_series->attachAxis(m_axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
@@ -537,7 +545,8 @@ void tst_QAbstractAxis::visible()
     QCOMPARE(spy10.count(), 0);
     QCOMPARE(spy11.count(), 0);
 
-    m_chart->setAxisX(m_axis, m_series);
+    m_chart->addAxis(m_axis, Qt::AlignBottom);
+    m_series->attachAxis(m_axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->isVisible(), visible);
@@ -584,7 +593,8 @@ void tst_QAbstractAxis::labelsAngle()
     QCOMPARE(spy10.count(), 0);
     QCOMPARE(spy11.count(), 0);
 
-    m_chart->setAxisX(m_axis, m_series);
+    m_chart->addAxis(m_axis, Qt::AlignBottom);
+    m_series->attachAxis(m_axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->labelsAngle(), labelsAngle);
@@ -738,7 +748,8 @@ void tst_QAbstractAxis::labelsVisible()
     QCOMPARE(spy10.count(), 0);
     QCOMPARE(spy11.count(), 0);
 
-    m_chart->setAxisX(m_axis, m_series);
+    m_chart->addAxis(m_axis, Qt::AlignBottom);
+    m_series->attachAxis(m_axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->labelsVisible(), labelsVisible);
@@ -769,9 +780,11 @@ void tst_QAbstractAxis::orientation()
     QSignalSpy spy11(m_axis, SIGNAL(minorGridLineColorChanged(QColor)));
 
     if(orientation==Qt::Vertical){
-        m_chart->setAxisY(m_axis,m_series);
+        m_chart->addAxis(m_axis, Qt::AlignLeft);
+        m_series->attachAxis(m_axis);
     }else{
-        m_chart->setAxisX(m_axis,m_series);
+        m_chart->addAxis(m_axis, Qt::AlignBottom);
+        m_series->attachAxis(m_axis);
     }
     QCOMPARE(m_axis->orientation(), orientation);
 
@@ -948,7 +961,8 @@ void tst_QAbstractAxis::shadesPen()
     QCOMPARE(spy10.count(), 0);
     QCOMPARE(spy11.count(), 0);
 
-    m_chart->setAxisX(m_axis, m_series);
+    m_chart->addAxis(m_axis, Qt::AlignBottom);
+    m_series->attachAxis(m_axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->shadesPen(), shadesPen);
@@ -996,7 +1010,8 @@ void tst_QAbstractAxis::shadesVisible()
     QCOMPARE(spy10.count(), 0);
     QCOMPARE(spy11.count(), 0);
 
-    m_chart->setAxisX(m_axis, m_series);
+    m_chart->addAxis(m_axis, Qt::AlignBottom);
+    m_series->attachAxis(m_axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->shadesVisible(), shadesVisible);
diff --git a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
index 0914706c..40294eb7 100644
--- a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
+++ b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
@@ -183,7 +183,8 @@ void tst_QBarCategoriesAxis::append()
     QCOMPARE(spy2.count(), 1);
     QCOMPARE(spy3.count(), 1);
 
-    m_chart->setAxisX(&axis, m_series);
+    m_chart->addAxis(&axis, Qt::AlignBottom);
+    m_series->attachAxis(&axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(axis.categories(), categories);
@@ -222,7 +223,8 @@ void tst_QBarCategoriesAxis::append2()
     QCOMPARE(spy2.count(), 1);
     QCOMPARE(spy3.count(), categories.count());
 
-    m_chart->setAxisX(&axis, m_series);
+    m_chart->addAxis(&axis, Qt::AlignBottom);
+    m_series->attachAxis(&axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(axis.categories(), categories);
@@ -266,7 +268,8 @@ void tst_QBarCategoriesAxis::at()
     QCOMPARE(spy2.count(), 0);
     QCOMPARE(spy3.count(), 0);
 
-    m_chart->setAxisX(&axis, m_series);
+    m_chart->addAxis(&axis, Qt::AlignBottom);
+    m_series->attachAxis(&axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(axis.at(index), string);
@@ -304,7 +307,8 @@ void tst_QBarCategoriesAxis::categories()
     QCOMPARE(spy2.count(), 1);
     QCOMPARE(spy3.count(), 1);
 
-    m_chart->setAxisX(&axis, m_series);
+    m_chart->addAxis(&axis, Qt::AlignBottom);
+    m_series->attachAxis(&axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(axis.categories(), categories);
@@ -345,7 +349,8 @@ void tst_QBarCategoriesAxis::clear()
     QCOMPARE(spy2.count(), 1);
     QCOMPARE(spy3.count(), 1);
 
-    m_chart->setAxisX(&axis, m_series);
+    m_chart->addAxis(&axis, Qt::AlignBottom);
+    m_series->attachAxis(&axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
@@ -393,7 +398,8 @@ void tst_QBarCategoriesAxis::count()
     QCOMPARE(spy3.count(), 0);
     QCOMPARE(spy4.count(), 0);
 
-    m_chart->setAxisX(&axis, m_series);
+    m_chart->addAxis(&axis, Qt::AlignBottom);
+    m_series->attachAxis(&axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(axis.count(), count);
@@ -432,7 +438,8 @@ void tst_QBarCategoriesAxis::insert()
     QCOMPARE(spy3.count(), 0);
     QCOMPARE(spy4.count(), 1);
 
-    m_chart->setAxisX(&axis, m_series);
+    m_chart->addAxis(&axis, Qt::AlignBottom);
+    m_series->attachAxis(&axis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
 }
@@ -511,7 +518,8 @@ void tst_QBarCategoriesAxis::max_data()
 
 void tst_QBarCategoriesAxis::max()
 {
-    m_chart->setAxisX(m_baraxis, m_series);
+    m_chart->addAxis(m_baraxis, Qt::AlignBottom);
+    m_series->attachAxis(m_baraxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     max_raw();
@@ -565,7 +573,8 @@ void tst_QBarCategoriesAxis::min_data()
 void tst_QBarCategoriesAxis::min()
 {
     min_raw();
-    m_chart->setAxisX(m_baraxis, m_series);
+    m_chart->addAxis(m_baraxis, Qt::AlignBottom);
+    m_series->attachAxis(m_baraxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
@@ -623,7 +632,8 @@ void tst_QBarCategoriesAxis::range_data()
 void tst_QBarCategoriesAxis::range()
 {
     range_raw();
-    m_chart->setAxisX(m_baraxis, m_series);
+    m_chart->addAxis(m_baraxis, Qt::AlignBottom);
+    m_series->attachAxis(m_baraxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
@@ -667,7 +677,8 @@ void tst_QBarCategoriesAxis::noautoscale()
     QCOMPARE(spy1.count(), 1);
     QCOMPARE(spy2.count(), 1);
 
-    m_chart->setAxisX(m_baraxis, m_series);
+    m_chart->addAxis(m_baraxis, Qt::AlignBottom);
+    m_series->attachAxis(m_baraxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_baraxis->min(),min);
@@ -690,7 +701,8 @@ void tst_QBarCategoriesAxis::autoscale()
 
     QCOMPARE(m_baraxis->min(),QString());
     QCOMPARE(m_baraxis->max(),QString());
-    m_chart->setAxisX(m_baraxis, m_series);
+    m_chart->addAxis(m_baraxis, Qt::AlignBottom);
+    m_series->attachAxis(m_baraxis);
 
     QCOMPARE(spy0.count(), 1);
     QCOMPARE(spy1.count(), 1);
diff --git a/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp b/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp
index d65a5a34..a7b00836 100644
--- a/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp
+++ b/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp
@@ -81,8 +81,15 @@ private Q_SLOTS:
     void mouseDoubleClicked();
 
 private:
-    QCandlestickSeries *m_series;
-    QList<QCandlestickSet *> m_sets;
+    QPointer<QCandlestickSeries> m_series;
+    struct SetList : QList<QPointer<QCandlestickSet>> {
+        operator QList<QCandlestickSet *> () const {
+            QList<QCandlestickSet *> list;
+            for (int i = 0; i < count(); ++i)
+                list.append(at(i));
+            return list;
+        }
+    }; SetList m_sets;
 };
 
 void tst_QCandlestickSeries::initTestCase()
@@ -119,14 +126,9 @@ void tst_QCandlestickSeries::init()
 
 void tst_QCandlestickSeries::cleanup()
 {
-    foreach (QCandlestickSet *set, m_sets) {
-        m_series->remove(set);
-        m_sets.removeAll(set);
-        delete set;
-    }
-
     delete m_series;
-    m_series = nullptr;
+    qDeleteAll(m_sets);
+    m_sets.clear();
 }
 
 void tst_QCandlestickSeries::qCandlestickSeries()
@@ -177,16 +179,20 @@ void tst_QCandlestickSeries::remove()
 
     // Remove some sets
     const int removeCount = 3;
-    for (int i = 0; i < removeCount; ++i)
+    for (int i = 0; i < removeCount; ++i) {
         QVERIFY(m_series->remove(m_sets.at(i)));
+        QVERIFY(!m_sets.at(i));
+    }
     QCOMPARE(m_series->count(), m_sets.count() - removeCount);
 
     for (int i = removeCount; i < m_sets.count(); ++i)
         QCOMPARE(m_series->sets().at(i - removeCount), m_sets.at(i));
 
     // Try removing all sets again (should be ok, even if some sets have already been removed)
-    for (int i = 0; i < m_sets.count(); ++i)
+    for (int i = 0; i < m_sets.count(); ++i) {
         m_series->remove(m_sets.at(i));
+        QVERIFY(!m_sets.at(i));
+    }
     QCOMPARE(m_series->count(), 0);
 }
 
diff --git a/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp b/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp
index 2a33d0a3..063db211 100644
--- a/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp
+++ b/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp
@@ -116,7 +116,8 @@ void tst_QCategoryAxis::qcategoryaxis()
     QCOMPARE(m_categoryaxis->type(), QAbstractAxis::AxisTypeCategory);
     QCOMPARE(m_categoryaxis->labelsPosition(), QCategoryAxis::AxisLabelsPositionCenter);
 
-    m_chart->setAxisX(m_categoryaxis, m_series);
+    m_chart->addAxis(m_categoryaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_categoryaxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
@@ -157,7 +158,8 @@ void tst_QCategoryAxis::max_data()
 
 void tst_QCategoryAxis::max()
 {
-    m_chart->setAxisX(m_categoryaxis, m_series);
+    m_chart->addAxis(m_categoryaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_categoryaxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     max_raw();
@@ -205,7 +207,8 @@ void tst_QCategoryAxis::min_data()
 
 void tst_QCategoryAxis::min()
 {
-    m_chart->setAxisX(m_categoryaxis, m_series);
+    m_chart->addAxis(m_categoryaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_categoryaxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     min_raw();
@@ -259,7 +262,8 @@ void tst_QCategoryAxis::range_data()
 
 void tst_QCategoryAxis::range()
 {
-    m_chart->setAxisX(m_categoryaxis, m_series);
+    m_chart->addAxis(m_categoryaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_categoryaxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     range_raw();
@@ -335,7 +339,8 @@ void tst_QCategoryAxis::reverse()
     m_categoryaxis->setReverse();
     QCOMPARE(m_categoryaxis->isReverse(), true);
 
-    m_chart->setAxisX(m_categoryaxis, m_series);
+    m_chart->addAxis(m_categoryaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_categoryaxis);
     QCOMPARE(spy.count(), 1);
 
     m_view->show();
diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp
index da94bbda..49313db8 100644
--- a/tests/auto/qchart/tst_qchart.cpp
+++ b/tests/auto/qchart/tst_qchart.cpp
@@ -181,8 +181,8 @@ void tst_QChart::qchart()
     QCOMPARE(m_chart->animationOptions(), QChart::NoAnimation);
     QCOMPARE(m_chart->animationDuration(), 1000);
     QCOMPARE(m_chart->animationEasingCurve(), QEasingCurve(QEasingCurve::OutQuart));
-    QVERIFY(!m_chart->axisX());
-    QVERIFY(!m_chart->axisY());
+    QVERIFY(m_chart->axes(Qt::Horizontal).isEmpty());
+    QVERIFY(m_chart->axes(Qt::Vertical).isEmpty());
     QVERIFY(m_chart->backgroundBrush()!=QBrush());
     QVERIFY(m_chart->backgroundPen()!=QPen());
     QCOMPARE(m_chart->isBackgroundVisible(), true);
@@ -250,11 +250,11 @@ void tst_QChart::addSeries()
     QVERIFY(series->chart() == m_chart);
     m_chart->createDefaultAxes();
     if(series->type()!=QAbstractSeries::SeriesTypePie){
-        QVERIFY(m_chart->axisY(series));
-        QVERIFY(m_chart->axisX(series));
+        QVERIFY(!m_chart->axes(Qt::Vertical, series).isEmpty());
+        QVERIFY(!m_chart->axes(Qt::Horizontal, series).isEmpty());
     }else{
-        QVERIFY(!m_chart->axisY(series));
-        QVERIFY(!m_chart->axisX(series));
+        QVERIFY(m_chart->axes(Qt::Vertical, series).isEmpty());
+        QVERIFY(m_chart->axes(Qt::Horizontal, series).isEmpty());
     }
     m_chart->removeSeries(series);
     QVERIFY(!series->chart());
@@ -336,12 +336,13 @@ void tst_QChart::axisX()
 {
     QFETCH(QAbstractAxis*, axis);
     QFETCH(QAbstractSeries*, series);
-    QVERIFY(!m_chart->axisX());
+    QVERIFY(m_chart->axes(Qt::Horizontal).isEmpty());
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     m_chart->addSeries(series);
-    m_chart->setAxisX(axis,series);
-    QVERIFY(m_chart->axisX(series)==axis);
+    m_chart->addAxis(axis, Qt::AlignBottom);
+    series->attachAxis(axis);
+    QCOMPARE(m_chart->axes(Qt::Horizontal, series).value(0), axis);
 }
 
 void tst_QChart::axisY_data()
@@ -354,12 +355,13 @@ void tst_QChart::axisY()
 {
     QFETCH(QAbstractAxis*, axis);
     QFETCH(QAbstractSeries*, series);
-    QVERIFY(!m_chart->axisY());
+    QVERIFY(m_chart->axes(Qt::Vertical).isEmpty());
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     m_chart->addSeries(series);
-    m_chart->setAxisY(axis,series);
-    QVERIFY(m_chart->axisY(series)==axis);
+    m_chart->addAxis(axis, Qt::AlignLeft);
+    series->attachAxis(axis);
+    QCOMPARE(m_chart->axes(Qt::Vertical, series).value(0), axis);
 }
 
 void tst_QChart::backgroundBrush_data()
@@ -545,14 +547,14 @@ void tst_QChart::removeAllSeries()
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     m_chart->createDefaultAxes();
     QCOMPARE(m_chart->axes().count(), 2);
-    QVERIFY(m_chart->axisY(series0)!=0);
-    QVERIFY(m_chart->axisY(series1)!=0);
-    QVERIFY(m_chart->axisY(series2)!=0);
+    QVERIFY(!m_chart->axes(Qt::Vertical, series0).isEmpty());
+    QVERIFY(!m_chart->axes(Qt::Vertical, series1).isEmpty());
+    QVERIFY(!m_chart->axes(Qt::Vertical, series2).isEmpty());
 
     m_chart->removeAllSeries();
     QCOMPARE(m_chart->axes().count(), 2);
-    QVERIFY(m_chart->axisX() != 0);
-    QVERIFY(m_chart->axisY() != 0);
+    QVERIFY(!m_chart->axes(Qt::Horizontal).isEmpty());
+    QVERIFY(!m_chart->axes(Qt::Vertical).isEmpty());
     QCOMPARE(deleteSpy1.count(), 1);
     QCOMPARE(deleteSpy2.count(), 1);
     QCOMPARE(deleteSpy3.count(), 1);
@@ -570,14 +572,17 @@ void tst_QChart::removeSeries()
     QSignalSpy deleteSpy(series, SIGNAL(destroyed()));
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
-    if(!axis) axis = m_chart->axisY();
+    if (!axis)
+        axis = m_chart->axes(Qt::Vertical).value(0);
+    QVERIFY(axis);
     m_chart->addSeries(series);
-    m_chart->setAxisY(axis,series);
-    QCOMPARE(m_chart->axisY(series),axis);
+    m_chart->addAxis(axis, Qt::AlignLeft);
+    series->attachAxis(axis);
+    QCOMPARE(m_chart->axes(Qt::Vertical, series).value(0), axis);
     m_chart->removeSeries(series);
     QCOMPARE(m_chart->axes().count(), 1);
-    QVERIFY(m_chart->axisY() != 0);
-    QVERIFY(m_chart->axisY(series)==0);
+    QVERIFY(!m_chart->axes(Qt::Vertical).isEmpty());
+    QVERIFY(m_chart->axes(Qt::Vertical, series).isEmpty());
     QCOMPARE(deleteSpy.count(), 0);
     delete series;
 }
@@ -601,8 +606,8 @@ void tst_QChart::scroll_right()
     m_chart->createDefaultAxes();
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
-    QAbstractAxis * axis = m_chart->axisX();
-    QVERIFY(axis!=0);
+    QAbstractAxis *axis = m_chart->axes(Qt::Horizontal).value(0);
+    QVERIFY(axis);
 
     switch(axis->type())
     {
@@ -645,8 +650,8 @@ void tst_QChart::scroll_left()
      m_chart->createDefaultAxes();
      m_view->show();
      QVERIFY(QTest::qWaitForWindowExposed(m_view));
-     QAbstractAxis * axis = m_chart->axisX();
-     QVERIFY(axis!=0);
+     QAbstractAxis *axis = m_chart->axes(Qt::Horizontal).value(0);
+     QVERIFY(axis);
 
      switch(axis->type())
         {
@@ -688,8 +693,8 @@ void tst_QChart::scroll_up()
     m_chart->createDefaultAxes();
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
-    QAbstractAxis * axis = m_chart->axisY();
-    QVERIFY(axis!=0);
+    QAbstractAxis *axis = m_chart->axes(Qt::Vertical).value(0);
+    QVERIFY(axis);
 
     switch(axis->type())
     {
@@ -731,8 +736,8 @@ void tst_QChart::scroll_down()
      m_chart->createDefaultAxes();
      m_view->show();
      QVERIFY(QTest::qWaitForWindowExposed(m_view));
-     QAbstractAxis * axis = m_chart->axisY();
-     QVERIFY(axis!=0);
+     QAbstractAxis *axis = m_chart->axes(Qt::Vertical).value(0);
+     QVERIFY(axis);
 
      switch(axis->type())
         {
@@ -844,10 +849,10 @@ void tst_QChart::zoomIn()
     m_chart->createDefaultAxes();
     QRectF marigns = m_chart->plotArea();
     rect.adjust(marigns.left(),marigns.top(),-marigns.right(),-marigns.bottom());
-    QValueAxis* axisX = qobject_cast<QValueAxis*>(m_chart->axisX());
-    QVERIFY(axisX!=0);
-    QValueAxis* axisY = qobject_cast<QValueAxis*>(m_chart->axisY());
-    QVERIFY(axisY!=0);
+    auto axisX = qobject_cast<QValueAxis *>(m_chart->axes(Qt::Horizontal).value(0));
+    QVERIFY(axisX);
+    auto axisY = qobject_cast<QValueAxis *>(m_chart->axes(Qt::Vertical).value(0));
+    QVERIFY(axisY);
     qreal minX = axisX->min();
     qreal minY = axisY->min();
     qreal maxX = axisX->max();
@@ -872,10 +877,10 @@ void tst_QChart::zoomOut()
     createTestData();
     m_chart->createDefaultAxes();
 
-    QValueAxis* axisX = qobject_cast<QValueAxis*>(m_chart->axisX());
-    QVERIFY(axisX!=0);
-    QValueAxis* axisY = qobject_cast<QValueAxis*>(m_chart->axisY());
-    QVERIFY(axisY!=0);
+    auto axisX = qobject_cast<QValueAxis *>(m_chart->axes(Qt::Horizontal).value(0));
+    QVERIFY(axisX);
+    auto axisY = qobject_cast<QValueAxis *>(m_chart->axes(Qt::Vertical).value(0));
+    QVERIFY(axisY);
 
     qreal minX = axisX->min();
     qreal minY = axisY->min();
@@ -912,10 +917,10 @@ void tst_QChart::zoomReset()
 {
     createTestData();
     m_chart->createDefaultAxes();
-    QValueAxis *axisX = qobject_cast<QValueAxis *>(m_chart->axisX());
-    QVERIFY(axisX != 0);
-    QValueAxis *axisY = qobject_cast<QValueAxis *>(m_chart->axisY());
-    QVERIFY(axisY != 0);
+    auto axisX = qobject_cast<QValueAxis *>(m_chart->axes(Qt::Horizontal).value(0));
+    QVERIFY(axisX);
+    auto axisY = qobject_cast<QValueAxis *>(m_chart->axes(Qt::Vertical).value(0));
+    QVERIFY(axisY);
 
     qreal minX = axisX->min();
     qreal minY = axisY->min();
@@ -1039,10 +1044,12 @@ void tst_QChart::createDefaultAxesForLineSeries()
     chart->addSeries(series1);
     chart->addSeries(series2);
     chart->createDefaultAxes();
-    QValueAxis *xAxis = (QValueAxis *)chart->axisX();
+    auto xAxis = qobject_cast<QValueAxis *>(chart->axes(Qt::Horizontal).value(0));
+    QVERIFY(xAxis);
     QCOMPARE(xAxis->min(), overallminX);
     QCOMPARE(xAxis->max(), overallmaxX);
-    QValueAxis *yAxis = (QValueAxis *)chart->axisY();
+    auto yAxis = qobject_cast<QValueAxis *>(chart->axes(Qt::Vertical).value(0));
+    QVERIFY(yAxis);
     QCOMPARE(yAxis->min(), overallminY);
     QCOMPARE(yAxis->max(), overallmaxY);
     QLineSeries *series3 = new QLineSeries(this);
@@ -1163,8 +1170,11 @@ void tst_QChart::zoomInAndOut()
         dateTimeAxisY->setRange(QDateTime::fromMSecsSinceEpoch(minY), QDateTime::fromMSecsSinceEpoch(maxY));
     }
 
-    m_chart->setAxisX(axisX, m_chart->series().first());
-    m_chart->setAxisY(axisY, m_chart->series().first());
+    const auto series = m_chart->series().constFirst();
+    m_chart->addAxis(axisX, Qt::AlignBottom);
+    series->attachAxis(axisX);
+    m_chart->addAxis(axisY, Qt::AlignLeft);
+    series->attachAxis(axisY);
     CHECK_AXIS_RANGES_MATCH
 
     m_chart->zoomIn();
diff --git a/tests/auto/qchartview/tst_qchartview.cpp b/tests/auto/qchartview/tst_qchartview.cpp
index df403710..dc70d7cb 100644
--- a/tests/auto/qchartview/tst_qchartview.cpp
+++ b/tests/auto/qchartview/tst_qchartview.cpp
@@ -169,9 +169,11 @@ void tst_QChartView::rubberBand()
     //this is hack since view does not get events otherwise
     m_view->setMouseTracking(true);
 
-    QAbstractAxis* axisY = m_view->chart()->axisY();
+    QAbstractAxis *axisY = m_view->chart()->axes(Qt::Vertical).value(0);
+    QVERIFY(axisY);
     QSignalSpy spy0(axisY, SIGNAL(rangeChanged(qreal,qreal)));
-    QAbstractAxis* axisX = m_view->chart()->axisX();
+    QAbstractAxis *axisX = m_view->chart()->axes(Qt::Horizontal).value(0);
+    QVERIFY(axisX);
     QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal,qreal)));
     QValueAxis* vaxisX = qobject_cast<QValueAxis*>(axisX);
     QValueAxis* vaxisY = qobject_cast<QValueAxis*>(axisY);
diff --git a/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp b/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp
index 1a5f2c27..13b6fbdf 100644
--- a/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp
+++ b/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp
@@ -94,8 +94,10 @@ void tst_QDateTimeAxis::init()
     m_view->resize(200, 200);
     m_chart = m_view->chart();
     m_chart->addSeries(m_series);
-    m_chart->setAxisY(m_dateTimeAxisY, m_series);
-    m_chart->setAxisX(m_dateTimeAxisX, m_series);
+    m_chart->addAxis(m_dateTimeAxisY, Qt::AlignLeft);
+    m_series->attachAxis(m_dateTimeAxisY);
+    m_chart->addAxis(m_dateTimeAxisX, Qt::AlignBottom);
+    m_series->attachAxis(m_dateTimeAxisX);
 }
 
 void tst_QDateTimeAxis::cleanup()
diff --git a/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp b/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp
index ba987670..fae92837 100644
--- a/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp
+++ b/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp
@@ -106,7 +106,12 @@ void tst_QLogValueAxis::qlogvalueaxis()
     QCOMPARE(m_logvaluesaxis->min(), (qreal)1);
     QCOMPARE(m_logvaluesaxis->type(), QAbstractAxis::AxisTypeLogValue);
 
-    m_chart->setAxisX(m_logvaluesaxis, m_series);
+    const auto oldXAxes = m_chart->axes(Qt::Horizontal);
+    for (auto oldXAxis : oldXAxes)
+        m_chart->removeAxis(oldXAxis);
+
+    m_chart->addAxis(m_logvaluesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_logvaluesaxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
@@ -159,7 +164,8 @@ void tst_QLogValueAxis::max_data()
 
 void tst_QLogValueAxis::max()
 {
-    m_chart->setAxisX(m_logvaluesaxis, m_series);
+    m_chart->addAxis(m_logvaluesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_logvaluesaxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     max_raw();
@@ -214,7 +220,8 @@ void tst_QLogValueAxis::min_data()
 
 void tst_QLogValueAxis::min()
 {
-    m_chart->setAxisX(m_logvaluesaxis, m_series);
+    m_chart->addAxis(m_logvaluesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_logvaluesaxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     min_raw();
@@ -278,7 +285,8 @@ void tst_QLogValueAxis::range_data()
 
 void tst_QLogValueAxis::range()
 {
-    m_chart->setAxisX(m_logvaluesaxis, m_series);
+    m_chart->addAxis(m_logvaluesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_logvaluesaxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     range_raw();
@@ -293,7 +301,8 @@ void tst_QLogValueAxis::range_before_show()
 {
     range_raw();
 
-    m_chart->setAxisX(m_logvaluesaxis, m_series);
+    m_chart->addAxis(m_logvaluesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_logvaluesaxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
 }
@@ -352,7 +361,11 @@ void tst_QLogValueAxis::autoscale()
 
     QCOMPARE(m_logvaluesaxis->min(), (qreal)1);
     QCOMPARE(m_logvaluesaxis->max(), (qreal)1);
-    m_chart->setAxisX(m_logvaluesaxis, m_series);
+    const auto oldXAxes = m_chart->axes(Qt::Horizontal);
+    for (auto oldXAxis : oldXAxes)
+        m_chart->removeAxis(oldXAxis);
+    m_chart->addAxis(m_logvaluesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_logvaluesaxis);
 
     QCOMPARE(spy0.count(), 1);
     QCOMPARE(spy1.count(), 0);
@@ -366,7 +379,11 @@ void tst_QLogValueAxis::autoscale()
 
 void tst_QLogValueAxis::zoom()
 {
-    m_chart->setAxisX(m_logvaluesaxis, m_series);
+    const auto oldXAxes = m_chart->axes(Qt::Horizontal);
+    for (auto oldXAxis : oldXAxes)
+        m_chart->removeAxis(oldXAxis);
+    m_chart->addAxis(m_logvaluesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_logvaluesaxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     m_logvaluesaxis->setBase(2);
diff --git a/tests/auto/qvalueaxis/tst_qvalueaxis.cpp b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
index d1dabd3e..7bedee0b 100644
--- a/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
+++ b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
@@ -73,6 +73,8 @@ private slots:
     void dynamicTicks();
 
 private:
+    void removeAxes();
+
     QValueAxis* m_valuesaxis;
     QLineSeries* m_series;
 };
@@ -89,6 +91,7 @@ void tst_QValueAxis::init()
 
 void tst_QValueAxis::cleanup()
 {
+    removeAxes();
     delete m_series;
     delete m_valuesaxis;
     m_series = 0;
@@ -96,6 +99,13 @@ void tst_QValueAxis::cleanup()
     tst_QAbstractAxis::cleanup();
 }
 
+void tst_QValueAxis::removeAxes()
+{
+    const auto oldAxes = m_chart->axes(Qt::Horizontal) + m_chart->axes(Qt::Vertical);
+    for (auto oldAxis : oldAxes)
+        m_chart->removeAxis(oldAxis);
+}
+
 void tst_QValueAxis::qvalueaxis_data()
 {
 }
@@ -109,7 +119,8 @@ void tst_QValueAxis::qvalueaxis()
     QCOMPARE(m_valuesaxis->tickCount(), 5);
     QCOMPARE(m_valuesaxis->type(), QAbstractAxis::AxisTypeValue);
 
-    m_chart->setAxisX(m_valuesaxis, m_series);
+    m_chart->addAxis(m_valuesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_valuesaxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
@@ -152,7 +163,8 @@ void tst_QValueAxis::max_data()
 
 void tst_QValueAxis::max()
 {
-    m_chart->setAxisX(m_valuesaxis, m_series);
+    m_chart->addAxis(m_valuesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_valuesaxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     max_raw();
@@ -200,7 +212,8 @@ void tst_QValueAxis::min_data()
 
 void tst_QValueAxis::min()
 {
-    m_chart->setAxisX(m_valuesaxis, m_series);
+    m_chart->addAxis(m_valuesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_valuesaxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     min_raw();
@@ -304,7 +317,8 @@ void tst_QValueAxis::range_data()
 
 void tst_QValueAxis::range()
 {
-    m_chart->setAxisX(m_valuesaxis, m_series);
+    m_chart->addAxis(m_valuesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_valuesaxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     range_raw();
@@ -347,7 +361,8 @@ void tst_QValueAxis::ticksCount()
     QCOMPARE(spy1.count(), 0);
     QCOMPARE(spy2.count(), 0);
 
-    m_chart->setAxisX(m_valuesaxis, m_series);
+    m_chart->addAxis(m_valuesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_valuesaxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
@@ -380,7 +395,8 @@ void tst_QValueAxis::noautoscale()
     QCOMPARE(spy1.count(), 1);
     QCOMPARE(spy2.count(), 1);
 
-    m_chart->setAxisX(m_valuesaxis, m_series);
+    m_chart->addAxis(m_valuesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_valuesaxis);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QVERIFY2(qFuzzyCompare(m_valuesaxis->min(), min), "Min not equal");
@@ -400,7 +416,8 @@ void tst_QValueAxis::autoscale()
 
     QVERIFY2(qFuzzyCompare(m_valuesaxis->min(), 0), "Min not equal");
     QVERIFY2(qFuzzyCompare(m_valuesaxis->max(), 0), "Max not equal");
-    m_chart->setAxisX(m_valuesaxis, m_series);
+    m_chart->addAxis(m_valuesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_valuesaxis);
 
     QCOMPARE(spy0.count(), 1);
     QCOMPARE(spy1.count(), 1);
@@ -420,7 +437,8 @@ void tst_QValueAxis::reverse()
     m_valuesaxis->setReverse();
     QCOMPARE(m_valuesaxis->isReverse(), true);
 
-    m_chart->setAxisX(m_valuesaxis, m_series);
+    m_chart->addAxis(m_valuesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_valuesaxis);
     QCOMPARE(spy.count(), 1);
 
     m_view->show();
@@ -430,7 +448,8 @@ void tst_QValueAxis::reverse()
 
 void tst_QValueAxis::labels()
 {
-    m_chart->setAxisX(m_valuesaxis, m_series);
+    m_chart->addAxis(m_valuesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_valuesaxis);
     m_view->resize(300, 300);
     m_view->show();
     QVERIFY(QTest::qWaitForWindowExposed(m_view));
@@ -465,9 +484,12 @@ void tst_QValueAxis::labels()
 
 void tst_QValueAxis::dynamicTicks()
 {
+    removeAxes(); // remove default axes created by init()
     QValueAxis *valuesaxis = new QValueAxis();
-    m_chart->setAxisX(m_valuesaxis, m_series);
-    m_chart->setAxisY(valuesaxis, m_series);
+    m_chart->addAxis(m_valuesaxis, Qt::AlignBottom);
+    m_series->attachAxis(m_valuesaxis);
+    m_chart->addAxis(valuesaxis, Qt::AlignLeft);
+    m_series->attachAxis(valuesaxis);
     m_view->resize(400, 400);
     m_valuesaxis->setRange(-111.0, 111);
     m_valuesaxis->setTickType(QValueAxis::TicksDynamic);
@@ -497,7 +519,7 @@ void tst_QValueAxis::dynamicTicks()
         }
     }
 
-    QCOMPARE(expectedList, observedStrings);
+    QCOMPARE(observedStrings, expectedList);
 }
 
 QTEST_MAIN(tst_QValueAxis)