4 files changed, 8 insertions, 8 deletions
diff --git a/tests/chartdesigner/engine.cpp b/tests/chartdesigner/engine.cpp
index d8b8b70b..ac113ed5 100644
--- a/tests/chartdesigner/engine.cpp
+++ b/tests/chartdesigner/engine.cpp
@@ -163,7 +163,7 @@ void Engine::removeSeries(QAbstractSeries* series)
     m_chart->removeSeries(series);
 
     foreach (const QModelIndex& index, m_seriesModelIndex.value(series)) {
-        m_model->setData(index, Qt::white, Qt::BackgroundRole);
+        m_model->setData(index, QColor(Qt::white), Qt::BackgroundRole);
     }
 }
 
diff --git a/tests/chartdesigner/engine.h b/tests/chartdesigner/engine.h
index 29e85955..96323592 100644
--- a/tests/chartdesigner/engine.h
+++ b/tests/chartdesigner/engine.h
@@ -29,15 +29,15 @@ class QStandardItemModel;
 class QItemSelectionModel;
 
 
-QTCOMMERCIALCHART_BEGIN_NAMESPACE
+QT_CHARTS_BEGIN_NAMESPACE
 class QChart;
 class QXYSeries;
 class QAbstractBarSeries;
 class QPieSeries;
 class QAreaSeries;
-QTCOMMERCIALCHART_END_NAMESPACE
+QT_CHARTS_END_NAMESPACE
 
-QTCOMMERCIALCHART_USE_NAMESPACE
+QT_CHARTS_USE_NAMESPACE
 
 class Engine : public QObject
 {
diff --git a/tests/chartdesigner/mainwindow.cpp b/tests/chartdesigner/mainwindow.cpp
index e84c0d43..0527bdd1 100644
--- a/tests/chartdesigner/mainwindow.cpp
+++ b/tests/chartdesigner/mainwindow.cpp
@@ -203,7 +203,7 @@ void MainWindow::createDockWidgets()
 
 void MainWindow::createLayout()
 {
-    m_table->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
+    m_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
 
     int rowHeight = m_table->rowHeight(0);
     int tableHeight = (m_engine->modelCount() * rowHeight) + m_table->horizontalHeader()->height() + 2 * m_table->frameWidth();
diff --git a/tests/chartdesigner/mainwindow.h b/tests/chartdesigner/mainwindow.h
index da03b2b4..6f21b166 100644
--- a/tests/chartdesigner/mainwindow.h
+++ b/tests/chartdesigner/mainwindow.h
@@ -26,10 +26,10 @@
 #include <QMap>
 
 
-QTCOMMERCIALCHART_BEGIN_NAMESPACE
+QT_CHARTS_BEGIN_NAMESPACE
 class QChartView;
 class QAbstractSeries;
-QTCOMMERCIALCHART_END_NAMESPACE
+QT_CHARTS_END_NAMESPACE
 
 class QGraphicsScene;
 class InspectorWidget;
@@ -38,7 +38,7 @@ class PenWidget;
 class QTableView;
 class Engine;
 
-QTCOMMERCIALCHART_USE_NAMESPACE
+QT_CHARTS_USE_NAMESPACE
 
 class MainWindow : public QMainWindow
 {