diff --git a/test/auto/qchart/tst_qchart.cpp b/test/auto/qchart/tst_qchart.cpp index fe5ca33..a91bac5 100644 --- a/test/auto/qchart/tst_qchart.cpp +++ b/test/auto/qchart/tst_qchart.cpp @@ -164,9 +164,16 @@ void tst_QChart::addSeries_data() QAbstractSeries* series2 = new QScatterSeries(this); QAbstractSeries* series3 = new QSplineSeries(this); QAbstractSeries* series4 = new QPieSeries(this); - QAbstractSeries* series5 = new QBarSeries(QBarCategories(),this); - QAbstractSeries* series6 = new QPercentBarSeries(QBarCategories(),this); - QAbstractSeries* series7 = new QStackedBarSeries(QBarCategories(),this); + QAbstractSeries* series5 = new QBarSeries(this); + QAbstractSeries* series6 = new QPercentBarSeries(this); + QAbstractSeries* series7 = new QStackedBarSeries(this); + + QBarSeries* s5 = static_cast (series5); + s5->setCategories(QBarCategories()); + QPercentBarSeries* s6 = static_cast (series6); + s6->setCategories(QBarCategories()); + QStackedBarSeries* s7 = static_cast (series7); + s7->setCategories(QBarCategories()); QAxis* axis = new QAxis(this); diff --git a/test/chartwidgettest/mainwidget.cpp b/test/chartwidgettest/mainwidget.cpp index 4e136b2..f9c7099 100644 --- a/test/chartwidgettest/mainwidget.cpp +++ b/test/chartwidgettest/mainwidget.cpp @@ -272,12 +272,16 @@ void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS foreach(QString label, labels) category << label; QBarSeries* series = 0; - if (seriesName == "Bar") - series = new QBarSeries(category, this); - else if (seriesName == "Stacked bar") - series = new QStackedBarSeries(category, this); - else - series = new QPercentBarSeries(category, this); + if (seriesName == "Bar") { + series = new QBarSeries(this); + series->setCategories(category); + } else if (seriesName == "Stacked bar") { + series = new QStackedBarSeries(this); + series->setCategories(category); + } else { + series = new QPercentBarSeries(this); + series->setCategories(category); + } for (int j(0); j < data.count(); j++) { QList column = data.at(j); diff --git a/test/gdpbarchart/widget.cpp b/test/gdpbarchart/widget.cpp index dfd6673..0cd68ba 100644 --- a/test/gdpbarchart/widget.cpp +++ b/test/gdpbarchart/widget.cpp @@ -140,8 +140,9 @@ void Widget::refreshChart() QStringList category; for (int i = 0; i < selectedCountriesStrings.size(); i++) category << selectedCountriesStrings[i]; - QBarSeries* series0 = new QBarSeries(category); - series0 = new QBarSeries(category); + QBarSeries* series0 = new QBarSeries(); + series0->setCategories(category); +// series0 = new QBarSeries(category); // prepare the selected counries SQL query QString countriesQuery = "country IN ("; diff --git a/test/tablemodelchart/tablewidget.cpp b/test/tablemodelchart/tablewidget.cpp index af81e48..0821ca3 100644 --- a/test/tablemodelchart/tablewidget.cpp +++ b/test/tablemodelchart/tablewidget.cpp @@ -370,7 +370,8 @@ void TableWidget::updateChartType(bool toggle) { m_chart->setAnimationOptions(QChart::SeriesAnimations); - QBarSeries* barSeries = new QBarSeries(QStringList()); + QBarSeries* barSeries = new QBarSeries(); + barSeries->setCategories(QStringList()); barSeries->setModel(m_model); // barSeries->setModelMappingRange(2, 5); barSeries->setModelMapping(5, 2, 4, Qt::Vertical);