diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-28 09:15:51 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-28 13:02:32 +0200 |
| commit | c42f3dfa70212a601ef476e8258cbfc1caaf5477 (patch) | |
| tree | 04086bad6666c73038d8bb0c469e4df4e96f9159 /tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp | |
| parent | 3d1e1d8042dc5172fa0d67283ef7c67d084a6d9f (diff) | |
Fix deprecation warnings about QtCharts::setAxisX(), setAxisY()
Use new API, fixing warnings like:
tst_qchart.cpp:343:34: warning: 'void QtCharts::QChart::setAxisX(QtCharts::QAbstractAxis*, QtCharts::QAbstractSeries*)' is deprecated [-Wdeprecated-declarations]
...
tst_qchart.cpp:361:34: warning: 'void QtCharts::QChart::setAxisY(QtCharts::QAbstractAxis*, QtCharts::QAbstractSeries*)' is deprecated [-Wdeprecated-declarations]
...
Some test appear to be relying on the axes being removed in a certain
order.
Change-Id: I86fab08d661afcd1087a55f847133a9e90d758f9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp')
| -rw-r--r-- | tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
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(); |