2 files changed, 16 insertions, 13 deletions
diff --git a/demos/chartthemes/themewidget.cpp b/demos/chartthemes/themewidget.cpp
index 4afa544a..0fb8391a 100644
--- a/demos/chartthemes/themewidget.cpp
+++ b/demos/chartthemes/themewidget.cpp
@@ -40,6 +40,7 @@
 #include <QGroupBox>
 #include <QLabel>
 #include <QTime>
+#include <QCategoriesAxis>
 
 ThemeWidget::ThemeWidget(QWidget* parent) :
     QWidget(parent),
@@ -177,8 +178,8 @@ QComboBox* ThemeWidget::createLegendBox() const
 QChart* ThemeWidget::createAreaChart() const
 {
     QChart *chart = new QChart();
-    chart->axisX()->setNiceNumbersEnabled(true);
-    chart->axisY()->setNiceNumbersEnabled(true);
+//    chart->axisX()->setNiceNumbersEnabled(true);
+//    chart->axisY()->setNiceNumbersEnabled(true);
     chart->setTitle("Area chart");
 
     // The lower series initialized to zero values
@@ -208,15 +209,16 @@ QChart* ThemeWidget::createAreaChart() const
 QChart* ThemeWidget::createBarChart(int valueCount) const
 {
     QChart* chart = new QChart();
-    chart->axisX()->setNiceNumbersEnabled(true);
-    chart->axisY()->setNiceNumbersEnabled(true);
+   //TODO: chart->axisX()->setNiceNumbersEnabled(true);
+   //TODO: chart->axisY()->setNiceNumbersEnabled(true);
     chart->setTitle("Bar chart");
 
     QStringList categories;
     for (int i(0); i < valueCount; i++)
         categories << QString::number(i);
 
-    chart->axisX()->categories()->insert(categories);
+    QCategoriesAxis* axis = new QCategoriesAxis();
+    axis->append(categories);
 
     QStackedBarSeries* series = new QStackedBarSeries(chart);
     for (int i(0); i < m_dataTable.count(); i++) {
@@ -226,6 +228,7 @@ QChart* ThemeWidget::createBarChart(int valueCount) const
         series->append(set);
     }
     chart->addSeries(series);
+    chart->setAxisX(series,axis);
 
     return chart;
 }
@@ -233,8 +236,8 @@ QChart* ThemeWidget::createBarChart(int valueCount) const
 QChart* ThemeWidget::createLineChart() const
 {
     QChart* chart = new QChart();
-    chart->axisX()->setNiceNumbersEnabled(true);
-    chart->axisY()->setNiceNumbersEnabled(true);
+    //TODO: chart->axisX()->setNiceNumbersEnabled(true);
+    //TODO: chart->axisY()->setNiceNumbersEnabled(true);
     chart->setTitle("Line chart");
 
     QString name("Series ");
@@ -279,8 +282,8 @@ QChart* ThemeWidget::createPieChart() const
 QChart* ThemeWidget::createSplineChart() const
 { // spine chart
     QChart* chart = new QChart();
-    chart->axisX()->setNiceNumbersEnabled(true);
-    chart->axisY()->setNiceNumbersEnabled(true);
+   //TODO: chart->axisX()->setNiceNumbersEnabled(true);
+   //TODO: chart->axisY()->setNiceNumbersEnabled(true);
     chart->setTitle("Spline chart");
     QString name("Series ");
     int nameIndex = 0;
@@ -298,8 +301,8 @@ QChart* ThemeWidget::createSplineChart() const
 QChart* ThemeWidget::createScatterChart() const
 { // scatter chart
     QChart* chart = new QChart();
-    chart->axisX()->setNiceNumbersEnabled(true);
-    chart->axisY()->setNiceNumbersEnabled(true);
+    //TODO: chart->axisX()->setNiceNumbersEnabled(true);
+    //TODO: chart->axisY()->setNiceNumbersEnabled(true);
     chart->setTitle("Scatter chart");
     QString name("Series ");
     int nameIndex = 0;
diff --git a/demos/dynamicspline/chart.cpp b/demos/dynamicspline/chart.cpp
index 3cf045d4..fc50c82c 100644
--- a/demos/dynamicspline/chart.cpp
+++ b/demos/dynamicspline/chart.cpp
@@ -19,7 +19,7 @@
 ****************************************************************************/
 
 #include "chart.h"
-#include <QAxis>
+#include <QAbstractAxis>
 #include <QSplineSeries>
 #include <QTime>
 
@@ -44,7 +44,7 @@ Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags)
 
     axisY()->setRange(-5, 5);
     axisX()->setRange(-9, 1);
-    axisX()->setTicksCount(11);
+    //TODO:axisX()->setTicksCount(11);
 
     m_timer.start();
 }