Fix include syntax

The includes for the whole project are changed to syntax:
'#include <module/class>

Change-Id: If32f8b6c3f47516ad6bc30ed40789ea9042d5664
Task-number: QTRD-3373
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

115 files changed, 499 insertions, 501 deletions

diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri
index a0915009..9d3ed05a 100644
--- a/tests/auto/auto.pri
+++ b/tests/auto/auto.pri
@@ -2,7 +2,7 @@
     error( "Couldn't find the tests.pri file!" )
 }
 
-    QT += testlib widgets
+QT += testlib widgets
 
 !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
 
diff --git a/tests/auto/chartdataset/tst_chartdataset.cpp b/tests/auto/chartdataset/tst_chartdataset.cpp
index 2a0f9637..29739b8c 100644
--- a/tests/auto/chartdataset/tst_chartdataset.cpp
+++ b/tests/auto/chartdataset/tst_chartdataset.cpp
@@ -40,21 +40,21 @@ QTEST_MAIN(tst_ChartDataSet)
 #else
 
 #include <QtTest/QtTest>
-#include <qabstractaxis.h>
-#include <qvalueaxis.h>
-#include <qbarcategoryaxis.h>
-#include <qcategoryaxis.h>
+#include <QtCharts/QAbstractAxis>
+#include <QtCharts/QValueAxis>
+#include <QtCharts/QBarCategoryAxis>
+#include <QtCharts/QCategoryAxis>
 #ifndef QT_ON_ARM
-#include "qdatetimeaxis.h"
+#include <QtCharts/QDateTimeAxis>
 #endif
-#include <qlineseries.h>
-#include <qareaseries.h>
-#include <qscatterseries.h>
-#include <qsplineseries.h>
-#include <qpieseries.h>
-#include <qbarseries.h>
-#include <qpercentbarseries.h>
-#include <qstackedbarseries.h>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QAreaSeries>
+#include <QtCharts/QScatterSeries>
+#include <QtCharts/QSplineSeries>
+#include <QtCharts/QPieSeries>
+#include <QtCharts/QBarSeries>
+#include <QtCharts/QPercentBarSeries>
+#include <QtCharts/QStackedBarSeries>
 #include <private/chartdataset_p.h>
 #include <private/abstractdomain_p.h>
 #include <tst_definitions.h>
diff --git a/tests/auto/inc/tst_definitions.h b/tests/auto/inc/tst_definitions.h
index 6dd4a837..b988c6c0 100644
--- a/tests/auto/inc/tst_definitions.h
+++ b/tests/auto/inc/tst_definitions.h
@@ -23,7 +23,7 @@
 
 #include <QtCharts/qpolarchart.h>
 #include <QtTest/QtTest>
-#include <QPushButton>
+#include <QtWidgets/QPushButton>
 
 namespace QTest
 {
diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.h b/tests/auto/qabstractaxis/tst_qabstractaxis.h
index 2ca5107a..92bd3b43 100644
--- a/tests/auto/qabstractaxis/tst_qabstractaxis.h
+++ b/tests/auto/qabstractaxis/tst_qabstractaxis.h
@@ -23,8 +23,8 @@
 
 #include <QtTest/QtTest>
 #include <tst_definitions.h>
-#include <qabstractaxis.h>
-#include <qchartview.h>
+#include <QtCharts/QAbstractAxis>
+#include <QtCharts/QChartView>
 
 QT_CHARTS_USE_NAMESPACE
 
diff --git a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
index 26d8dbb1..e9f53529 100644
--- a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
+++ b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
@@ -19,9 +19,9 @@
  ****************************************************************************/
 
 #include "../qabstractaxis/tst_qabstractaxis.h"
-#include <qbarseries.h>
-#include <qbarset.h>
-#include <qbarcategoryaxis.h>
+#include <QtCharts/QBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QBarCategoryAxis>
 
 class tst_QBarCategoriesAxis: public tst_QAbstractAxis
 {
diff --git a/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp b/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp
index 0e9fef5a..7ff67f31 100644
--- a/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp
+++ b/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp
@@ -21,13 +21,13 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 
-#include <qchart.h>
-#include <qchartview.h>
-#include <qbarseries.h>
-#include <qbarset.h>
-#include <qvbarmodelmapper.h>
-#include <qhbarmodelmapper.h>
-#include <QStandardItemModel>
+#include <QtCharts/QChart>
+#include <QtCharts/QChartView>
+#include <QtCharts/QBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QVBarModelMapper>
+#include <QtCharts/QHBarModelMapper>
+#include <QtGui/QStandardItemModel>
 
 QT_CHARTS_USE_NAMESPACE
 
diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp
index c9265e38..36876592 100644
--- a/tests/auto/qbarseries/tst_qbarseries.cpp
+++ b/tests/auto/qbarseries/tst_qbarseries.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <qbarseries.h>
-#include <qbarset.h>
-#include <qchartview.h>
-#include <qchart.h>
+#include <QtCharts/QBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QChartView>
+#include <QtCharts/QChart>
 #include "tst_definitions.h"
 
 QT_CHARTS_USE_NAMESPACE
diff --git a/tests/auto/qbarset/tst_qbarset.cpp b/tests/auto/qbarset/tst_qbarset.cpp
index 4c937dce..35a2ee58 100644
--- a/tests/auto/qbarset/tst_qbarset.cpp
+++ b/tests/auto/qbarset/tst_qbarset.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <qbarset.h>
-#include <qbarseries.h>
-#include <qchartview.h>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QBarSeries>
+#include <QtCharts/QChartView>
 #include "tst_definitions.h"
 
 QT_CHARTS_USE_NAMESPACE
diff --git a/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp b/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp
index ae9d13d9..ff5f3a4a 100644
--- a/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp
+++ b/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp
@@ -19,8 +19,8 @@
  ****************************************************************************/
 
 #include "../qabstractaxis/tst_qabstractaxis.h"
-#include "qcategoryaxis.h"
-#include <qlineseries.h>
+#include <QtCharts/QCategoryAxis>
+#include <QtCharts/QLineSeries>
 
 class tst_QCategoryAxis: public tst_QAbstractAxis
 {
diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp
index 18ae868c..bbc9ae19 100644
--- a/tests/auto/qchart/tst_qchart.cpp
+++ b/tests/auto/qchart/tst_qchart.cpp
@@ -19,18 +19,18 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <qchartview.h>
-#include <qlineseries.h>
-#include <qareaseries.h>
-#include <qscatterseries.h>
-#include <qsplineseries.h>
-#include <qpieseries.h>
-#include <qabstractbarseries.h>
-#include <qbarseries.h>
-#include <qpercentbarseries.h>
-#include <qstackedbarseries.h>
-#include <qvalueaxis.h>
-#include <qbarcategoryaxis.h>
+#include <QtCharts/QChartView>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QAreaSeries>
+#include <QtCharts/QScatterSeries>
+#include <QtCharts/QSplineSeries>
+#include <QtCharts/QPieSeries>
+#include <QtCharts/QAbstractBarSeries>
+#include <QtCharts/QBarSeries>
+#include <QtCharts/QPercentBarSeries>
+#include <QtCharts/QStackedBarSeries>
+#include <QtCharts/QValueAxis>
+#include <QtCharts/QBarCategoryAxis>
 #include "tst_definitions.h"
 
 QT_CHARTS_USE_NAMESPACE
diff --git a/tests/auto/qchartview/tst_qchartview.cpp b/tests/auto/qchartview/tst_qchartview.cpp
index f8264bad..cf90085e 100644
--- a/tests/auto/qchartview/tst_qchartview.cpp
+++ b/tests/auto/qchartview/tst_qchartview.cpp
@@ -23,7 +23,7 @@
 #include <QtCharts/qlineseries.h>
 #include <cmath>
 #include <tst_definitions.h>
-#include <QtCharts/qvalueaxis.h>
+#include <QtCharts/QValueAxis>
 
 QT_CHARTS_USE_NAMESPACE
 
diff --git a/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp b/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp
index 0c6c98cc..e71b9b56 100644
--- a/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp
+++ b/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp
@@ -19,8 +19,8 @@
  ****************************************************************************/
 
 #include "../qabstractaxis/tst_qabstractaxis.h"
-#include <qdatetimeaxis.h>
-#include <qlineseries.h>
+#include <QtCharts/QDateTimeAxis>
+#include <QtCharts/QLineSeries>
 
 class tst_QDateTimeAxis : public QObject//: public tst_QAbstractAxis
 {
diff --git a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp
index 5294ff2c..6445476c 100644
--- a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp
+++ b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <qhorizontalbarseries.h>
-#include <qbarset.h>
-#include <qchartview.h>
-#include <qchart.h>
+#include <QtCharts/QHorizontalBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QChartView>
+#include <QtCharts/QChart>
 #include "tst_definitions.h"
 
 QT_CHARTS_USE_NAMESPACE
diff --git a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp
index 63afbb2a..5300997e 100644
--- a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp
+++ b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <qhorizontalpercentbarseries.h>
-#include <qbarset.h>
-#include <qchartview.h>
-#include <qchart.h>
+#include <QtCharts/QHorizontalPercentBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QChartView>
+#include <QtCharts/QChart>
 #include "tst_definitions.h"
 
 QT_CHARTS_USE_NAMESPACE
diff --git a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp
index df4f0837..1d2e17bb 100644
--- a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp
+++ b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <qhorizontalstackedbarseries.h>
-#include <qbarset.h>
-#include <qchartview.h>
-#include <qchart.h>
+#include <QtCharts/QHorizontalStackedBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QChartView>
+#include <QtCharts/QChart>
 #include "tst_definitions.h"
 
 QT_CHARTS_USE_NAMESPACE
diff --git a/tests/auto/qlegend/tst_qlegend.cpp b/tests/auto/qlegend/tst_qlegend.cpp
index 7f14a43a..cc081e1e 100644
--- a/tests/auto/qlegend/tst_qlegend.cpp
+++ b/tests/auto/qlegend/tst_qlegend.cpp
@@ -19,18 +19,18 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <qchartview.h>
-#include <qlegend.h>
-#include <qpieseries.h>
-#include <qpielegendmarker.h>
-#include <qareaseries.h>
-#include <qarealegendmarker.h>
-#include <qlineseries.h>
-#include <qxylegendmarker.h>
-#include <qscatterseries.h>
-#include <qbarseries.h>
-#include <qbarset.h>
-#include <qbarlegendmarker.h>
+#include <QtCharts/QChartView>
+#include <QtCharts/QLegend>
+#include <QtCharts/QPieSeries>
+#include <QtCharts/QPieLegendMarker>
+#include <QtCharts/QAreaSeries>
+#include <QtCharts/QAreaLegendMarker>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QXYLegendMarker>
+#include <QtCharts/QScatterSeries>
+#include <QtCharts/QBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QBarLegendMarker>
 #include "tst_definitions.h"
 
 QT_CHARTS_USE_NAMESPACE
diff --git a/tests/auto/qlineseries/tst_qlineseries.cpp b/tests/auto/qlineseries/tst_qlineseries.cpp
index 4d270619..10ac896f 100644
--- a/tests/auto/qlineseries/tst_qlineseries.cpp
+++ b/tests/auto/qlineseries/tst_qlineseries.cpp
@@ -19,7 +19,7 @@
 ****************************************************************************/
 
 #include "../qxyseries/tst_qxyseries.h"
-#include <qlineseries.h>
+#include <QtCharts/QLineSeries>
 
 
 Q_DECLARE_METATYPE(QList<QPointF>)
diff --git a/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp b/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp
index 1b9dac09..3e764206 100644
--- a/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp
+++ b/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp
@@ -19,9 +19,9 @@
  ****************************************************************************/
 
 #include "../qabstractaxis/tst_qabstractaxis.h"
-#include "qlogvalueaxis.h"
-#include <qlineseries.h>
-#include <QDebug>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QLineSeries>
+#include <QtCore/QDebug>
 
 class tst_QLogValueAxis: public tst_QAbstractAxis
 {
diff --git a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
index dbe768e9..15bfc49e 100644
--- a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
+++ b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <qpercentbarseries.h>
-#include <qbarset.h>
-#include <qchartview.h>
-#include <qchart.h>
+#include <QtCharts/QPercentBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QChartView>
+#include <QtCharts/QChart>
 #include "tst_definitions.h"
 
 QT_CHARTS_USE_NAMESPACE
diff --git a/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp b/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp
index 28cf4a29..704e61df 100644
--- a/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp
+++ b/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp
@@ -21,13 +21,13 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 
-#include <qchart.h>
-#include <qchartview.h>
-#include <qpieseries.h>
-#include <qpieslice.h>
-#include <qvpiemodelmapper.h>
-#include <qhpiemodelmapper.h>
-#include <QStandardItemModel>
+#include <QtCharts/QChart>
+#include <QtCharts/QChartView>
+#include <QtCharts/QPieSeries>
+#include <QtCharts/QPieSlice>
+#include <QtCharts/QVPieModelMapper>
+#include <QtCharts/QHPieModelMapper>
+#include <QtGui/QStandardItemModel>
 
 QT_CHARTS_USE_NAMESPACE
 
diff --git a/tests/auto/qpieseries/tst_qpieseries.cpp b/tests/auto/qpieseries/tst_qpieseries.cpp
index 3b8f2adb..7bcb6d6b 100644
--- a/tests/auto/qpieseries/tst_qpieseries.cpp
+++ b/tests/auto/qpieseries/tst_qpieseries.cpp
@@ -19,12 +19,12 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <qchartview.h>
-#include <qchart.h>
-#include <qpieseries.h>
-#include <qpieslice.h>
-#include <qpiemodelmapper.h>
-#include <QStandardItemModel>
+#include <QtCharts/QChartView>
+#include <QtCharts/QChart>
+#include <QtCharts/QPieSeries>
+#include <QtCharts/QPieSlice>
+#include <QtCharts/QPieModelMapper>
+#include <QtGui/QStandardItemModel>
 #include <tst_definitions.h>
 
 QT_CHARTS_USE_NAMESPACE
diff --git a/tests/auto/qpieslice/tst_qpieslice.cpp b/tests/auto/qpieslice/tst_qpieslice.cpp
index 3ad5c47d..7f8887af 100644
--- a/tests/auto/qpieslice/tst_qpieslice.cpp
+++ b/tests/auto/qpieslice/tst_qpieslice.cpp
@@ -20,10 +20,10 @@
 
 #include <QtTest/QtTest>
 #include <tst_definitions.h>
-#include <qchartview.h>
-#include <qchart.h>
-#include <qpieslice.h>
-#include <qpieseries.h>
+#include <QtCharts/QChartView>
+#include <QtCharts/QChart>
+#include <QtCharts/QPieSlice>
+#include <QtCharts/QPieSeries>
 
 QT_CHARTS_USE_NAMESPACE
 
diff --git a/tests/auto/qscatterseries/tst_qscatterseries.cpp b/tests/auto/qscatterseries/tst_qscatterseries.cpp
index 16e3f31e..2c8a210d 100644
--- a/tests/auto/qscatterseries/tst_qscatterseries.cpp
+++ b/tests/auto/qscatterseries/tst_qscatterseries.cpp
@@ -19,7 +19,7 @@
 ****************************************************************************/
 
 #include "../qxyseries/tst_qxyseries.h"
-#include <qscatterseries.h>
+#include <QtCharts/QScatterSeries>
 
 Q_DECLARE_METATYPE(QList<QPointF>)
 
diff --git a/tests/auto/qsplineseries/tst_qsplineseries.cpp b/tests/auto/qsplineseries/tst_qsplineseries.cpp
index a5e95618..2ab15d04 100644
--- a/tests/auto/qsplineseries/tst_qsplineseries.cpp
+++ b/tests/auto/qsplineseries/tst_qsplineseries.cpp
@@ -19,7 +19,7 @@
 ****************************************************************************/
 
 #include "../qxyseries/tst_qxyseries.h"
-#include <qsplineseries.h>
+#include <QtCharts/QSplineSeries>
 
 Q_DECLARE_METATYPE(QList<QPointF>)
 
diff --git a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
index 868a61a1..17d447f6 100644
--- a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
+++ b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <qstackedbarseries.h>
-#include <qbarset.h>
-#include <qchartview.h>
-#include <qchart.h>
+#include <QtCharts/QStackedBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QChartView>
+#include <QtCharts/QChart>
 #include "tst_definitions.h"
 
 QT_CHARTS_USE_NAMESPACE
diff --git a/tests/auto/qvalueaxis/tst_qvalueaxis.cpp b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
index 88848b5f..df86c988 100644
--- a/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
+++ b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
@@ -19,8 +19,8 @@
  ****************************************************************************/
 
 #include "../qabstractaxis/tst_qabstractaxis.h"
-#include "qvalueaxis.h"
-#include <qlineseries.h>
+#include <QtCharts/QValueAxis>
+#include <QtCharts/QLineSeries>
 
 class tst_QValueAxis: public tst_QAbstractAxis
 {
diff --git a/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp b/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp
index 5431d5cf..6538da68 100644
--- a/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp
+++ b/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp
@@ -21,13 +21,13 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 
-#include <qchart.h>
-#include <qchartview.h>
-#include <qxyseries.h>
-#include <qlineseries.h>
-#include <qvxymodelmapper.h>
-#include <qhxymodelmapper.h>
-#include <QStandardItemModel>
+#include <QtCharts/QChart>
+#include <QtCharts/QChartView>
+#include <QtCharts/QXYSeries>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QVXYModelMapper>
+#include <QtCharts/QHXYModelMapper>
+#include <QtGui/QStandardItemModel>
 #include "tst_definitions.h"
 
 QT_CHARTS_USE_NAMESPACE
diff --git a/tests/auto/qxyseries/tst_qxyseries.h b/tests/auto/qxyseries/tst_qxyseries.h
index 58d6a5c6..4b9ab8fb 100644
--- a/tests/auto/qxyseries/tst_qxyseries.h
+++ b/tests/auto/qxyseries/tst_qxyseries.h
@@ -22,9 +22,9 @@
 #define TST_QXYSERIES_H
 
 #include <QtTest/QtTest>
-#include <qxyseries.h>
-#include <qchartview.h>
-#include <QStandardItemModel>
+#include <QtCharts/QXYSeries>
+#include <QtCharts/QChartView>
+#include <QtGui/QStandardItemModel>
 #include <tst_definitions.h>
 
 QT_CHARTS_USE_NAMESPACE
diff --git a/tests/boxplottester/boxplottester.pro b/tests/boxplottester/boxplottester.pro
index 1cad76ce..575ae45a 100644
--- a/tests/boxplottester/boxplottester.pro
+++ b/tests/boxplottester/boxplottester.pro
@@ -4,6 +4,7 @@
 
 TEMPLATE = app
 
+QT += charts
 QT += core gui
 contains(QT_MAJOR_VERSION, 5) {
     QT += widgets
diff --git a/tests/boxplottester/customtablemodel.cpp b/tests/boxplottester/customtablemodel.cpp
index c91c0779..162dfa28 100644
--- a/tests/boxplottester/customtablemodel.cpp
+++ b/tests/boxplottester/customtablemodel.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "customtablemodel.h"
-#include <QVector>
-#include <QTime>
-#include <QRect>
-#include <QColor>
+#include <QtCore/QVector>
+#include <QtCore/QTime>
+#include <QtCore/QRect>
+#include <QtGui/QColor>
 
 const QString categories[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Nov", "Dec"};
 
diff --git a/tests/boxplottester/customtablemodel.h b/tests/boxplottester/customtablemodel.h
index daa6b392..f5207618 100644
--- a/tests/boxplottester/customtablemodel.h
+++ b/tests/boxplottester/customtablemodel.h
@@ -21,9 +21,9 @@
 #ifndef CUSTOMTABLEMODEL_H
 #define CUSTOMTABLEMODEL_H
 
-#include <QAbstractTableModel>
-#include <QHash>
-#include <QRect>
+#include <QtCore/QAbstractTableModel>
+#include <QtCore/QHash>
+#include <QtCore/QRect>
 
 class CustomTableModel : public QAbstractTableModel
 {
diff --git a/tests/boxplottester/mainwidget.cpp b/tests/boxplottester/mainwidget.cpp
index 3421de05..792cdae5 100644
--- a/tests/boxplottester/mainwidget.cpp
+++ b/tests/boxplottester/mainwidget.cpp
@@ -21,30 +21,30 @@
 #include "mainwidget.h"
 #include "customtablemodel.h"
 #include "pentool.h"
-#include <QVBoxPlotModelMapper>
-#include <QTableView>
-#include <QHeaderView>
-#include <QChartView>
-#include <QBoxPlotSeries>
-#include <QBoxSet>
-#include <QLegend>
-#include <QBarCategoryAxis>
-#include <QBrush>
-#include <QColor>
-#include <QPushButton>
-#include <QComboBox>
-#include <QSpinBox>
-#include <QCheckBox>
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QSpacerItem>
-#include <QMessageBox>
+#include <QtCharts/QVBoxPlotModelMapper>
+#include <QtWidgets/QTableView>
+#include <QtWidgets/QHeaderView>
+#include <QtCharts/QChartView>
+#include <QtCharts/QBoxPlotSeries>
+#include <QtCharts/QBoxSet>
+#include <QtCharts/QLegend>
+#include <QtCharts/QBarCategoryAxis>
+#include <QtGui/QBrush>
+#include <QtGui/QColor>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QSpacerItem>
+#include <QtWidgets/QMessageBox>
 #include <cmath>
-#include <QDebug>
-#include <QStandardItemModel>
-#include <QBarCategoryAxis>
-#include <QLogValueAxis>
+#include <QtCore/QDebug>
+#include <QtGui/QStandardItemModel>
+#include <QtCharts/QBarCategoryAxis>
+#include <QtCharts/QLogValueAxis>
 
 QT_CHARTS_USE_NAMESPACE
 
diff --git a/tests/boxplottester/mainwidget.h b/tests/boxplottester/mainwidget.h
index 3c78ffd2..cbb2cd38 100644
--- a/tests/boxplottester/mainwidget.h
+++ b/tests/boxplottester/mainwidget.h
@@ -21,19 +21,19 @@
 #ifndef MAINWIDGET_H
 #define MAINWIDGET_H
 
-#include "qchartglobal.h"
-#include "qchart.h"
-#include "qchartview.h"
-#include "customtablemodel.h"
-#include "pentool.h"
-#include <QWidget>
-#include <QBoxPlotSeries>
-#include <QBarCategoryAxis>
-#include <QBoxSet>
-#include <QCheckBox>
-#include <QDoubleSpinBox>
+#include <QtCharts/QChartGlobal>
+#include <QtCharts/QChart>
+#include <QtCharts/QChartView>
+#include <QtWidgets/QWidget>
+#include <QtCharts/QBoxPlotSeries>
+#include <QtCharts/QBarCategoryAxis>
+#include <QtCharts/QBoxSet>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QDoubleSpinBox>
 
 class QGridLayout;
+class CustomTableModel;
+class PenTool;
 
 QT_CHARTS_USE_NAMESPACE
 
diff --git a/tests/boxplottester/pentool.cpp b/tests/boxplottester/pentool.cpp
index 104231ee..b827039f 100644
--- a/tests/boxplottester/pentool.cpp
+++ b/tests/boxplottester/pentool.cpp
@@ -19,11 +19,11 @@
 ****************************************************************************/
 
 #include "pentool.h"
-#include <QPushButton>
-#include <QDoubleSpinBox>
-#include <QComboBox>
-#include <QFormLayout>
-#include <QColorDialog>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QDoubleSpinBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QColorDialog>
 
 PenTool::PenTool(QString title, QWidget *parent)
     : QWidget(parent)
diff --git a/tests/boxplottester/pentool.h b/tests/boxplottester/pentool.h
index 66e7ab10..13b4064d 100644
--- a/tests/boxplottester/pentool.h
+++ b/tests/boxplottester/pentool.h
@@ -20,8 +20,8 @@
 #ifndef PENTOOL_H
 #define PENTOOL_H
 
-#include <QWidget>
-#include <QPen>
+#include <QtWidgets/QWidget>
+#include <QtGui/QPen>
 
 class QPushButton;
 class QDoubleSpinBox;
diff --git a/tests/chartdesigner/brushwidget.h b/tests/chartdesigner/brushwidget.h
index 985493ec..7f570cb5 100644
--- a/tests/chartdesigner/brushwidget.h
+++ b/tests/chartdesigner/brushwidget.h
@@ -21,7 +21,7 @@
 #ifndef BRUSHWIDGET_H
 #define BRUSHWIDGET_H
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class BrushWidget: public QWidget
 {
diff --git a/tests/chartdesigner/engine.cpp b/tests/chartdesigner/engine.cpp
index ac113ed5..b7ea9e93 100644
--- a/tests/chartdesigner/engine.cpp
+++ b/tests/chartdesigner/engine.cpp
@@ -19,21 +19,21 @@
  ****************************************************************************/
 
 #include "engine.h"
-#include <QItemSelectionModel>
-#include <QStandardItemModel>
-#include <QVXYModelMapper>
-#include <QHBarModelMapper>
-#include <QVPieModelMapper>
-#include <QLineSeries>
-#include <QSplineSeries>
-#include <QScatterSeries>
-#include <QBarSeries>
-#include <QPercentBarSeries>
-#include <QStackedBarSeries>
-#include <QAreaSeries>
-#include <QPieSeries>
-#include <QChart>
-#include <QBarSet>
+#include <QtCore/QItemSelectionModel>
+#include <QtGui/QStandardItemModel>
+#include <QtCharts/QVXYModelMapper>
+#include <QtCharts/QHBarModelMapper>
+#include <QtCharts/QVPieModelMapper>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QSplineSeries>
+#include <QtCharts/QScatterSeries>
+#include <QtCharts/QBarSeries>
+#include <QtCharts/QPercentBarSeries>
+#include <QtCharts/QStackedBarSeries>
+#include <QtCharts/QAreaSeries>
+#include <QtCharts/QPieSeries>
+#include <QtCharts/QChart>
+#include <QtCharts/QBarSet>
 
 
 const qint32 MAGIC_NUMBER = 0x66666666;
diff --git a/tests/chartdesigner/engine.h b/tests/chartdesigner/engine.h
index 96323592..eef15dcf 100644
--- a/tests/chartdesigner/engine.h
+++ b/tests/chartdesigner/engine.h
@@ -21,9 +21,9 @@
 #ifndef ENGINE_H
 #define ENGINE_H
 
-#include <QObject>
-#include <QAbstractSeries>
-#include <QModelIndex>
+#include <QtCore/QObject>
+#include <QtCharts/QAbstractSeries>
+#include <QtCore/QModelIndex>
 
 class QStandardItemModel;
 class QItemSelectionModel;
diff --git a/tests/chartdesigner/main.cpp b/tests/chartdesigner/main.cpp
index a2f146fc..6b47caf5 100644
--- a/tests/chartdesigner/main.cpp
+++ b/tests/chartdesigner/main.cpp
@@ -19,7 +19,7 @@
 ****************************************************************************/
 
 #include "mainwindow.h"
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/chartdesigner/mainwindow.cpp b/tests/chartdesigner/mainwindow.cpp
index 0527bdd1..70588459 100644
--- a/tests/chartdesigner/mainwindow.cpp
+++ b/tests/chartdesigner/mainwindow.cpp
@@ -23,17 +23,17 @@
 #include "penwidget.h"
 #include "brushwidget.h"
 #include "engine.h"
-#include <QSettings>
-#include <QChartView>
-#include <QDockWidget>
-#include <QMenuBar>
-#include <QTableWidget>
-#include <QSplitter>
-#include <QMetaEnum>
-#include <QStandardItemModel>
-#include <QHeaderView>
-#include <QDebug>
-#include <QMessageBox>
+#include <QtCore/QSettings>
+#include <QtCharts/QChartView>
+#include <QtWidgets/QDockWidget>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QTableWidget>
+#include <QtWidgets/QSplitter>
+#include <QtCore/QMetaEnum>
+#include <QtGui/QStandardItemModel>
+#include <QtWidgets/QHeaderView>
+#include <QtCore/QDebug>
+#include <QtWidgets/QMessageBox>
 
 static const QString FILENAME_SETTING("filename");
 static const QString GEOMETRY_SETTING("geometry");
diff --git a/tests/chartdesigner/mainwindow.h b/tests/chartdesigner/mainwindow.h
index 6f21b166..d5ce5418 100644
--- a/tests/chartdesigner/mainwindow.h
+++ b/tests/chartdesigner/mainwindow.h
@@ -21,9 +21,9 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QMainWindow>
-#include <QChartGlobal>
-#include <QMap>
+#include <QtWidgets/QMainWindow>
+#include <QtCharts/QChartGlobal>
+#include <QtCore/QMap>
 
 
 QT_CHARTS_BEGIN_NAMESPACE
diff --git a/tests/chartdesigner/objectinspectorwidget.cpp b/tests/chartdesigner/objectinspectorwidget.cpp
index acf9cb3f..64a89854 100644
--- a/tests/chartdesigner/objectinspectorwidget.cpp
+++ b/tests/chartdesigner/objectinspectorwidget.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include "objectinspectorwidget.h"
-#include <QIcon>
-#include <QPainter>
-#include <QPixmapCache>
+#include <QtGui/QIcon>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmapCache>
 
 InspectorWidget::InspectorWidget()
 {
diff --git a/tests/chartdesigner/objectinspectorwidget.h b/tests/chartdesigner/objectinspectorwidget.h
index 59015658..ba9deed4 100644
--- a/tests/chartdesigner/objectinspectorwidget.h
+++ b/tests/chartdesigner/objectinspectorwidget.h
@@ -21,7 +21,7 @@
 #ifndef INSPECTORWIDGET_H
 #define INSPECTORWIDGET_H
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class InspectorWidget : public QWidget
 {
diff --git a/tests/chartdesigner/penwidget.cpp b/tests/chartdesigner/penwidget.cpp
index 51bffd8e..e2b22f64 100644
--- a/tests/chartdesigner/penwidget.cpp
+++ b/tests/chartdesigner/penwidget.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include "penwidget.h"
-#include <QFormLayout>
-#include <QComboBox>
-#include <QSpinBox>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QSpinBox>
 
 PenWidget::PenWidget(QWidget *parent):QWidget(parent),
 m_colorComboBox(0),
diff --git a/tests/chartdesigner/penwidget.h b/tests/chartdesigner/penwidget.h
index b96864dc..fe9998c0 100644
--- a/tests/chartdesigner/penwidget.h
+++ b/tests/chartdesigner/penwidget.h
@@ -21,8 +21,8 @@
 #ifndef PENWIDGET_H
 #define PENWIDGET_H
 
-#include <QWidget>
-#include <QPen>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QPen>
 
 class QComboBox;
 class QSpinBox;
diff --git a/tests/chartviewer/charts.h b/tests/chartviewer/charts.h
index ab25467f..131354e8 100644
--- a/tests/chartviewer/charts.h
+++ b/tests/chartviewer/charts.h
@@ -22,9 +22,9 @@
 #ifndef CHARTS_H
 #define CHARTS_H
 #include "model.h"
-#include <QList>
-#include <QString>
-#include <qchartglobal.h>
+#include <QtCore/QList>
+#include <QtCore/QString>
+#include <QtCharts/QChartGlobal>
 
 QT_CHARTS_BEGIN_NAMESPACE
 class QChart;
diff --git a/tests/chartviewer/charts/axis/barcategoryaxisx.cpp b/tests/chartviewer/charts/axis/barcategoryaxisx.cpp
index 69540027..250576bb 100644
--- a/tests/chartviewer/charts/axis/barcategoryaxisx.cpp
+++ b/tests/chartviewer/charts/axis/barcategoryaxisx.cpp
@@ -19,11 +19,11 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qbarseries.h"
-#include "qbarset.h"
-#include "qvalueaxis.h"
-#include "qbarcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QValueAxis>
+#include <QtCharts/QBarCategoryAxis>
 
 class BarCategoryAxisX: public Chart
 {
diff --git a/tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp b/tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp
index 5a0caa76..516d0f49 100644
--- a/tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp
+++ b/tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp
@@ -19,11 +19,11 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qbarseries.h"
-#include "qbarset.h"
-#include "qlogvalueaxis.h"
-#include "qbarcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QBarCategoryAxis>
 
 class BarCategoryAxisXLogY: public Chart
 {
diff --git a/tests/chartviewer/charts/axis/barcategoryaxisy.cpp b/tests/chartviewer/charts/axis/barcategoryaxisy.cpp
index 122ae086..d20442b2 100644
--- a/tests/chartviewer/charts/axis/barcategoryaxisy.cpp
+++ b/tests/chartviewer/charts/axis/barcategoryaxisy.cpp
@@ -19,11 +19,11 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qhorizontalbarseries.h"
-#include "qbarset.h"
-#include "qvalueaxis.h"
-#include "qbarcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QHorizontalBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QValueAxis>
+#include <QtCharts/QBarCategoryAxis>
 
 class BarCategoryAxisY: public Chart
 {
diff --git a/tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp b/tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp
index 1f1c72ab..f38cf931 100644
--- a/tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp
+++ b/tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp
@@ -19,11 +19,11 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qhorizontalbarseries.h"
-#include "qbarset.h"
-#include "qlogvalueaxis.h"
-#include "qbarcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QHorizontalBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QBarCategoryAxis>
 
 class BarCategoryAxisYLogX: public Chart
 {
diff --git a/tests/chartviewer/charts/axis/categoryaxis.cpp b/tests/chartviewer/charts/axis/categoryaxis.cpp
index ab32638e..dc025f6d 100644
--- a/tests/chartviewer/charts/axis/categoryaxis.cpp
+++ b/tests/chartviewer/charts/axis/categoryaxis.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
-#include <QCategoryAxis>
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QCategoryAxis>
 
 class CategoryLineChart: public Chart
 {
diff --git a/tests/chartviewer/charts/axis/datetimeaxisx.cpp b/tests/chartviewer/charts/axis/datetimeaxisx.cpp
index 3d2083e4..99154bbc 100644
--- a/tests/chartviewer/charts/axis/datetimeaxisx.cpp
+++ b/tests/chartviewer/charts/axis/datetimeaxisx.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
-#include "qvalueaxis.h"
-#include "qdatetimeaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QValueAxis>
+#include <QtCharts/QDateTimeAxis>
 
 class DateTimeAxisX: public Chart
 {
diff --git a/tests/chartviewer/charts/axis/datetimeaxisy.cpp b/tests/chartviewer/charts/axis/datetimeaxisy.cpp
index 3336e4cc..0234eb6a 100644
--- a/tests/chartviewer/charts/axis/datetimeaxisy.cpp
+++ b/tests/chartviewer/charts/axis/datetimeaxisy.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
-#include "qvalueaxis.h"
-#include "qdatetimeaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QValueAxis>
+#include <QtCharts/QDateTimeAxis>
 
 class DateTimeAxisY: public Chart
 {
diff --git a/tests/chartviewer/charts/axis/logvalueaxisx.cpp b/tests/chartviewer/charts/axis/logvalueaxisx.cpp
index 0efd9c11..d60a1f18 100644
--- a/tests/chartviewer/charts/axis/logvalueaxisx.cpp
+++ b/tests/chartviewer/charts/axis/logvalueaxisx.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
-#include "qlogvalueaxis.h"
-#include "qcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QCategoryAxis>
 
 class LogValueAxisX: public Chart
 {
diff --git a/tests/chartviewer/charts/axis/logvalueaxisy.cpp b/tests/chartviewer/charts/axis/logvalueaxisy.cpp
index be48969e..cc631515 100644
--- a/tests/chartviewer/charts/axis/logvalueaxisy.cpp
+++ b/tests/chartviewer/charts/axis/logvalueaxisy.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
-#include "qlogvalueaxis.h"
-#include "qcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QCategoryAxis>
 
 class LogValueAxisY: public Chart
 {
diff --git a/tests/chartviewer/charts/axis/valueaxis.cpp b/tests/chartviewer/charts/axis/valueaxis.cpp
index 3d696432..9bbfb0c9 100644
--- a/tests/chartviewer/charts/axis/valueaxis.cpp
+++ b/tests/chartviewer/charts/axis/valueaxis.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
-#include "qvalueaxis.h"
-#include "qcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QValueAxis>
+#include <QtCharts/QCategoryAxis>
 
 class ValueAxis: public Chart
 {
diff --git a/tests/chartviewer/charts/barseries/horizontalbarchart.cpp b/tests/chartviewer/charts/barseries/horizontalbarchart.cpp
index b164e6a2..3cc1887e 100644
--- a/tests/chartviewer/charts/barseries/horizontalbarchart.cpp
+++ b/tests/chartviewer/charts/barseries/horizontalbarchart.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qhorizontalbarseries.h"
-#include "qbarset.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QHorizontalBarSeries>
+#include <QtCharts/QBarSet>
 
 class HorizontalBarChart: public Chart
 {
diff --git a/tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp b/tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp
index 750e123a..71cd14f0 100644
--- a/tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp
+++ b/tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qhorizontalpercentbarseries.h"
-#include "qbarset.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QHorizontalPercentBarSeries>
+#include <QtCharts/QBarSet>
 
 class HorizontalPercentBarChart: public Chart
 {
diff --git a/tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp b/tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp
index 25da32bb..7dab6791 100644
--- a/tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp
+++ b/tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qhorizontalstackedbarseries.h"
-#include "qbarset.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QHorizontalStackedBarSeries>
+#include <QtCharts/QBarSet>
 
 class HorizontalStackedBarChart: public Chart
 {
diff --git a/tests/chartviewer/charts/barseries/verticalbarchart.cpp b/tests/chartviewer/charts/barseries/verticalbarchart.cpp
index 5dd16449..d7dbbaa0 100644
--- a/tests/chartviewer/charts/barseries/verticalbarchart.cpp
+++ b/tests/chartviewer/charts/barseries/verticalbarchart.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qbarseries.h"
-#include "qbarset.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QBarSeries>
+#include <QtCharts/QBarSet>
 
 class VerticalBarChart: public Chart
 {
diff --git a/tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp b/tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp
index 4888c9b0..e219ebc0 100644
--- a/tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp
+++ b/tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qpercentbarseries.h"
-#include "qbarset.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QPercentBarSeries>
+#include <QtCharts/QBarSet>
 
 class VerticalPercentBarChart: public Chart
 {
diff --git a/tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp b/tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp
index bb5b1540..84986acc 100644
--- a/tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp
+++ b/tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qstackedbarseries.h"
-#include "qbarset.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QStackedBarSeries>
+#include <QtCharts/QBarSet>
 
 class VerticalStackedBarChart: public Chart
 {
diff --git a/tests/chartviewer/charts/domain/barlogx.cpp b/tests/chartviewer/charts/domain/barlogx.cpp
index 3ffc3f0f..32a36755 100644
--- a/tests/chartviewer/charts/domain/barlogx.cpp
+++ b/tests/chartviewer/charts/domain/barlogx.cpp
@@ -19,11 +19,11 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qhorizontalbarseries.h"
-#include "qbarset.h"
-#include "qlogvalueaxis.h"
-#include "qbarcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QHorizontalBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QBarCategoryAxis>
 
 class BarLogX: public Chart
 {
diff --git a/tests/chartviewer/charts/domain/barlogy.cpp b/tests/chartviewer/charts/domain/barlogy.cpp
index 8503f806..e8c36acd 100644
--- a/tests/chartviewer/charts/domain/barlogy.cpp
+++ b/tests/chartviewer/charts/domain/barlogy.cpp
@@ -19,11 +19,11 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qbarseries.h"
-#include "qbarset.h"
-#include "qlogvalueaxis.h"
-#include "qbarcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QBarCategoryAxis>
 
 class BarLogY: public Chart
 {
diff --git a/tests/chartviewer/charts/domain/barpercentlogx.cpp b/tests/chartviewer/charts/domain/barpercentlogx.cpp
index b2b84732..ce61c5cc 100644
--- a/tests/chartviewer/charts/domain/barpercentlogx.cpp
+++ b/tests/chartviewer/charts/domain/barpercentlogx.cpp
@@ -19,11 +19,11 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qhorizontalpercentbarseries.h"
-#include "qbarset.h"
-#include "qlogvalueaxis.h"
-#include "qbarcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QHorizontalPercentBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QBarCategoryAxis>
 
 class BarPercentLogX: public Chart
 {
diff --git a/tests/chartviewer/charts/domain/barpercentlogy.cpp b/tests/chartviewer/charts/domain/barpercentlogy.cpp
index f55cf886..cf10e76c 100644
--- a/tests/chartviewer/charts/domain/barpercentlogy.cpp
+++ b/tests/chartviewer/charts/domain/barpercentlogy.cpp
@@ -19,11 +19,11 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qpercentbarseries.h"
-#include "qbarset.h"
-#include "qlogvalueaxis.h"
-#include "qbarcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QPercentBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QBarCategoryAxis>
 
 class BarPercentLogY: public Chart
 {
diff --git a/tests/chartviewer/charts/domain/barstackedlogx.cpp b/tests/chartviewer/charts/domain/barstackedlogx.cpp
index 448bdd9c..e10445f1 100644
--- a/tests/chartviewer/charts/domain/barstackedlogx.cpp
+++ b/tests/chartviewer/charts/domain/barstackedlogx.cpp
@@ -19,11 +19,11 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qhorizontalstackedbarseries.h"
-#include "qbarset.h"
-#include "qlogvalueaxis.h"
-#include "qbarcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QHorizontalStackedBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QBarCategoryAxis>
 
 class BarStackedLogX: public Chart
 {
diff --git a/tests/chartviewer/charts/domain/barstackedlogy.cpp b/tests/chartviewer/charts/domain/barstackedlogy.cpp
index bdf81248..114252d9 100644
--- a/tests/chartviewer/charts/domain/barstackedlogy.cpp
+++ b/tests/chartviewer/charts/domain/barstackedlogy.cpp
@@ -19,11 +19,11 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qstackedbarseries.h"
-#include "qbarset.h"
-#include "qlogvalueaxis.h"
-#include "qbarcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QStackedBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QBarCategoryAxis>
 
 class BarStackedLogY: public Chart
 {
diff --git a/tests/chartviewer/charts/domain/linelogxlogy.cpp b/tests/chartviewer/charts/domain/linelogxlogy.cpp
index dbeeb5d5..dea1ef04 100644
--- a/tests/chartviewer/charts/domain/linelogxlogy.cpp
+++ b/tests/chartviewer/charts/domain/linelogxlogy.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
-#include "qlogvalueaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QLogValueAxis>
 
 class LineLogXLogY: public Chart
 {
diff --git a/tests/chartviewer/charts/domain/linelogxy.cpp b/tests/chartviewer/charts/domain/linelogxy.cpp
index a465d7bd..ca0d7cf1 100644
--- a/tests/chartviewer/charts/domain/linelogxy.cpp
+++ b/tests/chartviewer/charts/domain/linelogxy.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
-#include "qlogvalueaxis.h"
-#include "qvalueaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QValueAxis>
 
 class LineLogXY: public Chart
 {
diff --git a/tests/chartviewer/charts/domain/linexlogy.cpp b/tests/chartviewer/charts/domain/linexlogy.cpp
index 2f20a0f6..16ec254d 100644
--- a/tests/chartviewer/charts/domain/linexlogy.cpp
+++ b/tests/chartviewer/charts/domain/linexlogy.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
-#include "qlogvalueaxis.h"
-#include "qvalueaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QValueAxis>
 
 class LineXLogY: public Chart
 {
diff --git a/tests/chartviewer/charts/domain/scatterlogxlogy.cpp b/tests/chartviewer/charts/domain/scatterlogxlogy.cpp
index 7c01409e..c87def5c 100644
--- a/tests/chartviewer/charts/domain/scatterlogxlogy.cpp
+++ b/tests/chartviewer/charts/domain/scatterlogxlogy.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qscatterseries.h"
-#include "qlogvalueaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QScatterSeries>
+#include <QtCharts/QLogValueAxis>
 
 class ScatterLogXLogY: public Chart
 {
diff --git a/tests/chartviewer/charts/domain/scatterlogxy.cpp b/tests/chartviewer/charts/domain/scatterlogxy.cpp
index 11138431..d7603616 100644
--- a/tests/chartviewer/charts/domain/scatterlogxy.cpp
+++ b/tests/chartviewer/charts/domain/scatterlogxy.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qscatterseries.h"
-#include "qlogvalueaxis.h"
-#include "qvalueaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QScatterSeries>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QValueAxis>
 
 class ScatterLogXY: public Chart
 {
diff --git a/tests/chartviewer/charts/domain/scatterxlogy.cpp b/tests/chartviewer/charts/domain/scatterxlogy.cpp
index c2813299..bc09bf66 100644
--- a/tests/chartviewer/charts/domain/scatterxlogy.cpp
+++ b/tests/chartviewer/charts/domain/scatterxlogy.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qscatterseries.h"
-#include "qlogvalueaxis.h"
-#include "qvalueaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QScatterSeries>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QValueAxis>
 
 class ScatterXLogY: public Chart
 {
diff --git a/tests/chartviewer/charts/domain/splinelogxlogy.cpp b/tests/chartviewer/charts/domain/splinelogxlogy.cpp
index cf103a07..b87a4bb7 100644
--- a/tests/chartviewer/charts/domain/splinelogxlogy.cpp
+++ b/tests/chartviewer/charts/domain/splinelogxlogy.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qsplineseries.h"
-#include "qlogvalueaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QSplineSeries>
+#include <QtCharts/QLogValueAxis>
 
 class SplineLogXLogY: public Chart
 {
diff --git a/tests/chartviewer/charts/domain/splinelogxy.cpp b/tests/chartviewer/charts/domain/splinelogxy.cpp
index 7feb5806..0354aadf 100644
--- a/tests/chartviewer/charts/domain/splinelogxy.cpp
+++ b/tests/chartviewer/charts/domain/splinelogxy.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qsplineseries.h"
-#include "qlogvalueaxis.h"
-#include "qvalueaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QSplineSeries>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QValueAxis>
 
 class SplineLogXY: public Chart
 {
diff --git a/tests/chartviewer/charts/domain/splinexlogy.cpp b/tests/chartviewer/charts/domain/splinexlogy.cpp
index e0a36d01..6a6d8210 100644
--- a/tests/chartviewer/charts/domain/splinexlogy.cpp
+++ b/tests/chartviewer/charts/domain/splinexlogy.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qsplineseries.h"
-#include "qlogvalueaxis.h"
-#include "qvalueaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QSplineSeries>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QValueAxis>
 
 class SplineXLogY: public Chart
 {
diff --git a/tests/chartviewer/charts/font/font.cpp b/tests/chartviewer/charts/font/font.cpp
index 82c36b6a..b544ca94 100644
--- a/tests/chartviewer/charts/font/font.cpp
+++ b/tests/chartviewer/charts/font/font.cpp
@@ -19,8 +19,8 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
 
 class FontChart: public Chart
 {
diff --git a/tests/chartviewer/charts/multiaxis/multivalueaxis.cpp b/tests/chartviewer/charts/multiaxis/multivalueaxis.cpp
index d44eacd5..960b9c6a 100644
--- a/tests/chartviewer/charts/multiaxis/multivalueaxis.cpp
+++ b/tests/chartviewer/charts/multiaxis/multivalueaxis.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
-#include "qvalueaxis.h"
-#include "qcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QValueAxis>
+#include <QtCharts/QCategoryAxis>
 
 class MultiValueAxis: public Chart
 {
diff --git a/tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp b/tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp
index 63a776f0..91e1d7a3 100644
--- a/tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp
+++ b/tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
-#include "qvalueaxis.h"
-#include "qcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QValueAxis>
+#include <QtCharts/QCategoryAxis>
 
 class MultiValueAxis2: public Chart
 {
diff --git a/tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp b/tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp
index 0ecb6bcd..3d25169e 100644
--- a/tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp
+++ b/tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
-#include "qvalueaxis.h"
-#include "qcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QValueAxis>
+#include <QtCharts/QCategoryAxis>
 
 class MultiValueAxis3: public Chart
 {
diff --git a/tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp b/tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp
index 2f40f827..5a69ec74 100644
--- a/tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp
+++ b/tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp
@@ -19,10 +19,10 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
-#include "qvalueaxis.h"
-#include "qcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QValueAxis>
+#include <QtCharts/QCategoryAxis>
 
 class MultiValueAxis4: public Chart
 {
diff --git a/tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp b/tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp
index e26e2a36..300a0f4b 100644
--- a/tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp
+++ b/tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp
@@ -19,13 +19,13 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
-#include "qvalueaxis.h"
-#include "qcategoryaxis.h"
-#include "qbarseries.h"
-#include "qbarset.h"
-#include "qbarcategoryaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QValueAxis>
+#include <QtCharts/QCategoryAxis>
+#include <QtCharts/QBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QBarCategoryAxis>
 
 class MultiValueBarAxis: public Chart
 {
diff --git a/tests/chartviewer/charts/pieseries/donutchart.cpp b/tests/chartviewer/charts/pieseries/donutchart.cpp
index 1231de57..50026ecf 100644
--- a/tests/chartviewer/charts/pieseries/donutchart.cpp
+++ b/tests/chartviewer/charts/pieseries/donutchart.cpp
@@ -19,8 +19,8 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qpieseries.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QPieSeries>
 
 class DonutChart: public Chart
 {
diff --git a/tests/chartviewer/charts/pieseries/piechart.cpp b/tests/chartviewer/charts/pieseries/piechart.cpp
index cae98ac0..f88e4657 100644
--- a/tests/chartviewer/charts/pieseries/piechart.cpp
+++ b/tests/chartviewer/charts/pieseries/piechart.cpp
@@ -19,8 +19,8 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qpieseries.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QPieSeries>
 
 class PieChart: public Chart
 {
diff --git a/tests/chartviewer/charts/size/sizecharts.cpp b/tests/chartviewer/charts/size/sizecharts.cpp
index 2f22930e..6be59159 100644
--- a/tests/chartviewer/charts/size/sizecharts.cpp
+++ b/tests/chartviewer/charts/size/sizecharts.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
-#include "qvalueaxis.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QValueAxis>
 
 class SizeChart: public Chart
 {
diff --git a/tests/chartviewer/charts/xyseries/areachart.cpp b/tests/chartviewer/charts/xyseries/areachart.cpp
index 8af95079..dc869c3b 100644
--- a/tests/chartviewer/charts/xyseries/areachart.cpp
+++ b/tests/chartviewer/charts/xyseries/areachart.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qareaseries.h"
-#include "qlineseries.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QAreaSeries>
+#include <QtCharts/QLineSeries>
 
 class AreaChart: public Chart
 {
diff --git a/tests/chartviewer/charts/xyseries/linechart.cpp b/tests/chartviewer/charts/xyseries/linechart.cpp
index 5cf6cbff..4ef39e4c 100644
--- a/tests/chartviewer/charts/xyseries/linechart.cpp
+++ b/tests/chartviewer/charts/xyseries/linechart.cpp
@@ -19,8 +19,8 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qlineseries.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QLineSeries>
 
 class LineChart: public Chart
 {
diff --git a/tests/chartviewer/charts/xyseries/scatterchart.cpp b/tests/chartviewer/charts/xyseries/scatterchart.cpp
index cac7640d..d49e7f49 100644
--- a/tests/chartviewer/charts/xyseries/scatterchart.cpp
+++ b/tests/chartviewer/charts/xyseries/scatterchart.cpp
@@ -19,8 +19,8 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qscatterseries.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QScatterSeries>
 
 class ScatterChart: public Chart
 {
diff --git a/tests/chartviewer/charts/xyseries/splinechart.cpp b/tests/chartviewer/charts/xyseries/splinechart.cpp
index 555165bb..38ffe340 100644
--- a/tests/chartviewer/charts/xyseries/splinechart.cpp
+++ b/tests/chartviewer/charts/xyseries/splinechart.cpp
@@ -19,8 +19,8 @@
 ****************************************************************************/
 
 #include "charts.h"
-#include "qchart.h"
-#include "qsplineseries.h"
+#include <QtCharts/QChart>
+#include <QtCharts/QSplineSeries>
 
 class SplineChart: public Chart
 {
diff --git a/tests/chartviewer/grid.cpp b/tests/chartviewer/grid.cpp
index 3620b9f6..f1619ab0 100644
--- a/tests/chartviewer/grid.cpp
+++ b/tests/chartviewer/grid.cpp
@@ -20,10 +20,10 @@
 
 #include "grid.h"
 #include "charts.h"
-#include <qchart.h>
-#include <QGraphicsGridLayout>
-#include <QGraphicsSceneMouseEvent>
-#include <QDebug>
+#include <QtCharts/QChart>
+#include <QtWidgets/QGraphicsGridLayout>
+#include <QtWidgets/QGraphicsSceneMouseEvent>
+#include <QtCore/QDebug>
 
 Grid::Grid(int size, QGraphicsItem *parent)
     : QGraphicsWidget(parent),
diff --git a/tests/chartviewer/grid.h b/tests/chartviewer/grid.h
index 276fcceb..a519503d 100644
--- a/tests/chartviewer/grid.h
+++ b/tests/chartviewer/grid.h
@@ -22,8 +22,8 @@
 #define GRID_H_
 
 #include "model.h"
-#include <QGraphicsWidget>
-#include <QChartGlobal>
+#include <QtWidgets/QGraphicsWidget>
+#include <QtCharts/QChartGlobal>
 
 class QGraphicsGridLayout;
 class Chart;
diff --git a/tests/chartviewer/main.cpp b/tests/chartviewer/main.cpp
index 2745f575..6a267632 100644
--- a/tests/chartviewer/main.cpp
+++ b/tests/chartviewer/main.cpp
@@ -19,8 +19,8 @@
 ****************************************************************************/
 
 #include "window.h"
-#include <QApplication>
-#include <QMainWindow>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMainWindow>
 #include <iostream>
 
 QVariantHash parseArgs(QStringList args)
diff --git a/tests/chartviewer/model.h b/tests/chartviewer/model.h
index f3e80a22..0400a631 100644
--- a/tests/chartviewer/model.h
+++ b/tests/chartviewer/model.h
@@ -21,10 +21,10 @@
 #ifndef MODEL_H
 #define MODEL_H
 
-#include <QList>
-#include <QPair>
-#include <QPointF>
-#include <QTime>
+#include <QtCore/QList>
+#include <QtCore/QPair>
+#include <QtCore/QPointF>
+#include <QtCore/QTime>
 #include <stdlib.h>
 
 typedef QPair<QPointF, QString> Data;
diff --git a/tests/chartviewer/view.cpp b/tests/chartviewer/view.cpp
index 870efe29..67ef7918 100644
--- a/tests/chartviewer/view.cpp
+++ b/tests/chartviewer/view.cpp
@@ -19,9 +19,9 @@
  ****************************************************************************/
 
 #include "view.h"
-#include <QGraphicsWidget>
-#include <QResizeEvent>
-#include <QDebug>
+#include <QtWidgets/QGraphicsWidget>
+#include <QtGui/QResizeEvent>
+#include <QtCore/QDebug>
 
 View::View(QGraphicsScene *scene, QGraphicsWidget *form , QWidget *parent)
     : QGraphicsView(scene, parent),
diff --git a/tests/chartviewer/view.h b/tests/chartviewer/view.h
index 4206cad0..c9c80860 100644
--- a/tests/chartviewer/view.h
+++ b/tests/chartviewer/view.h
@@ -20,7 +20,7 @@
 
 #ifndef VIEW_H
 #define VIEW_H
-#include <QGraphicsView>
+#include <QtWidgets/QGraphicsView>
 
 class QGraphicsScene;
 class QResizeEvent;
diff --git a/tests/chartviewer/window.cpp b/tests/chartviewer/window.cpp
index d59202d4..d535adf6 100644
--- a/tests/chartviewer/window.cpp
+++ b/tests/chartviewer/window.cpp
@@ -22,24 +22,24 @@
 #include "view.h"
 #include "grid.h"
 #include "charts.h"
-#include <QChartView>
-#include <QAreaSeries>
-#include <QLegend>
-#include <QGridLayout>
-#include <QFormLayout>
-#include <QComboBox>
-#include <QSpinBox>
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QGraphicsScene>
-#include <QGraphicsLinearLayout>
-#include <QGraphicsProxyWidget>
-#include <QGLWidget>
-#include <QApplication>
-#include <QDebug>
-#include <QMenu>
-#include <QPushButton>
+#include <QtCharts/QChartView>
+#include <QtCharts/QAreaSeries>
+#include <QtCharts/QLegend>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QGraphicsScene>
+#include <QtWidgets/QGraphicsLinearLayout>
+#include <QtWidgets/QGraphicsProxyWidget>
+#include <QtOpenGL/QGLWidget>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QPushButton>
 
 Window::Window(const QVariantHash &parameters, QWidget *parent)
     : QMainWindow(parent),
diff --git a/tests/chartviewer/window.h b/tests/chartviewer/window.h
index 53fa7171..94d954ee 100644
--- a/tests/chartviewer/window.h
+++ b/tests/chartviewer/window.h
@@ -20,10 +20,10 @@
 
 #ifndef WINDOW_H
 #define WINDOW_H
-#include <QMainWindow>
-#include <QChartGlobal>
-#include <QHash>
-#include <QComboBox>
+#include <QtWidgets/QMainWindow>
+#include <QtCharts/QChartGlobal>
+#include <QtCore/QHash>
+#include <QtWidgets/QComboBox>
 
 class QCheckBox;
 class QGraphicsRectItem;
diff --git a/tests/chartwidgettest/dataseriedialog.cpp b/tests/chartwidgettest/dataseriedialog.cpp
index cca419d5..622e975c 100644
--- a/tests/chartwidgettest/dataseriedialog.cpp
+++ b/tests/chartwidgettest/dataseriedialog.cpp
@@ -19,14 +19,14 @@
 ****************************************************************************/

 

 #include "dataseriedialog.h"

-#include <QDialogButtonBox>

-#include <QGridLayout>

-#include <QCheckBox>

-#include <QPushButton>

-#include <QGroupBox>

-#include <QRadioButton>

-#include <QLabel>

-#include <QDebug>

+#include <QtWidgets/QDialogButtonBox>

+#include <QtWidgets/QGridLayout>

+#include <QtWidgets/QCheckBox>

+#include <QtWidgets/QPushButton>

+#include <QtWidgets/QGroupBox>

+#include <QtWidgets/QRadioButton>

+#include <QtWidgets/QLabel>

+#include <QtCore/QDebug>

 

 DataSerieDialog::DataSerieDialog(QWidget *parent) :

     QDialog(parent)

diff --git a/tests/chartwidgettest/dataseriedialog.h b/tests/chartwidgettest/dataseriedialog.h
index aad3bfd6..9fc8cf7c 100644
--- a/tests/chartwidgettest/dataseriedialog.h
+++ b/tests/chartwidgettest/dataseriedialog.h
@@ -21,7 +21,7 @@
 #ifndef DATASERIEDIALOG_H

 #define DATASERIEDIALOG_H

 

-#include <QDialog>

+#include <QtWidgets/QDialog>

 

 class QGroupBox;

 class QCheckBox;

diff --git a/tests/chartwidgettest/mainwidget.cpp b/tests/chartwidgettest/mainwidget.cpp
index 76676a93..eb263f90 100644
--- a/tests/chartwidgettest/mainwidget.cpp
+++ b/tests/chartwidgettest/mainwidget.cpp
@@ -20,30 +20,30 @@
 

 #include "mainwidget.h"

 #include "dataseriedialog.h"

-#include "qchartview.h"

-#include "qpieseries.h"

-#include "qscatterseries.h"

-#include "qlineseries.h"

-#include <qareaseries.h>

-#include <qsplineseries.h>

-#include <qbarset.h>

-#include <qbarseries.h>

-#include <qstackedbarseries.h>

-#include <qpercentbarseries.h>

-#include <QPushButton>

-#include <QComboBox>

-#include <QSpinBox>

-#include <QCheckBox>

-#include <QGridLayout>

-#include <QHBoxLayout>

-#include <QLabel>

-#include <QSpacerItem>

-#include <QMessageBox>

+#include <QtCharts/QChartView>

+#include <QtCharts/QPieSeries>

+#include <QtCharts/QScatterSeries>

+#include <QtCharts/QLineSeries>

+#include <QtCharts/QAreaSeries>

+#include <QtCharts/QSplineSeries>

+#include <QtCharts/QBarSet>

+#include <QtCharts/QBarSeries>

+#include <QtCharts/QStackedBarSeries>

+#include <QtCharts/QPercentBarSeries>

+#include <QtWidgets/QPushButton>

+#include <QtWidgets/QComboBox>

+#include <QtWidgets/QSpinBox>

+#include <QtWidgets/QCheckBox>

+#include <QtWidgets/QGridLayout>

+#include <QtWidgets/QHBoxLayout>

+#include <QtWidgets/QLabel>

+#include <QtWidgets/QSpacerItem>

+#include <QtWidgets/QMessageBox>

 #include <cmath>

-#include <QDebug>

-#include <QStandardItemModel>

-#include <QBarCategoryAxis>

-#include <QGLWidget>

+#include <QtCore/QDebug>

+#include <QtGui/QStandardItemModel>

+#include <QtCharts/QBarCategoryAxis>

+#include <QtOpenGL/QGLWidget>

 

 QT_CHARTS_USE_NAMESPACE

 

diff --git a/tests/chartwidgettest/mainwidget.h b/tests/chartwidgettest/mainwidget.h
index 49d36518..4549c0d4 100644
--- a/tests/chartwidgettest/mainwidget.h
+++ b/tests/chartwidgettest/mainwidget.h
@@ -21,10 +21,10 @@
 #ifndef MAINWIDGET_H

 #define MAINWIDGET_H

 

-#include "qchartglobal.h"

-#include "qchart.h"

-#include "qchartview.h"

-#include <QWidget>

+#include <QtCharts/QChartGlobal>

+#include <QtCharts/QChart>

+#include <QtCharts/QChartView>

+#include <QtWidgets/QWidget>

 

 class QSpinBox;

 class QCheckBox;

diff --git a/tests/polarcharttest/chartview.cpp b/tests/polarcharttest/chartview.cpp
index f0d72994..37a25f8f 100644
--- a/tests/polarcharttest/chartview.cpp
+++ b/tests/polarcharttest/chartview.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include "chartview.h"
-#include <QMouseEvent>
-#include <QDebug>
-#include <QAbstractAxis>
+#include <QtGui/QMouseEvent>
+#include <QtCore/QDebug>
+#include <QtCharts/QAbstractAxis>
 
 QT_CHARTS_USE_NAMESPACE
 
diff --git a/tests/polarcharttest/chartview.h b/tests/polarcharttest/chartview.h
index 550e8d83..fb8b4ff9 100644
--- a/tests/polarcharttest/chartview.h
+++ b/tests/polarcharttest/chartview.h
@@ -21,8 +21,8 @@
 #ifndef CHARTVIEW_H
 #define CHARTVIEW_H
 
-#include <QChartView>
-#include <QPolarChart>
+#include <QtCharts/QChartView>
+#include <QtCharts/QPolarChart>
 
 QT_CHARTS_USE_NAMESPACE
 
diff --git a/tests/polarcharttest/main.cpp b/tests/polarcharttest/main.cpp
index 6d74893a..28203655 100644
--- a/tests/polarcharttest/main.cpp
+++ b/tests/polarcharttest/main.cpp
@@ -19,7 +19,7 @@
 ****************************************************************************/
 
 #include "mainwindow.h"
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/polarcharttest/mainwindow.cpp b/tests/polarcharttest/mainwindow.cpp
index e1dddcc9..79c8918f 100644
--- a/tests/polarcharttest/mainwindow.cpp
+++ b/tests/polarcharttest/mainwindow.cpp
@@ -20,20 +20,20 @@
 
 #include "mainwindow.h"
 #include "chartview.h"
-#include <QScatterSeries>
-#include <QLineSeries>
-#include <QSplineSeries>
-#include <QAreaSeries>
-#include <QBarSeries>
-#include <QBarSet>
-#include <QValueAxis>
-#include <QLogValueAxis>
-#include <QDateTimeAxis>
-#include <QCategoryAxis>
-#include <QPolarChart>
-#include <QDebug>
-#include <qmath.h>
-#include <QDateTime>
+#include <QtCharts/QScatterSeries>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QSplineSeries>
+#include <QtCharts/QAreaSeries>
+#include <QtCharts/QBarSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QValueAxis>
+#include <QtCharts/QLogValueAxis>
+#include <QtCharts/QDateTimeAxis>
+#include <QtCharts/QCategoryAxis>
+#include <QtCharts/QPolarChart>
+#include <QtCore/QDebug>
+#include <QtCore/QtMath>
+#include <QtCore/QDateTime>
 
 QT_CHARTS_USE_NAMESPACE
 #include "ui_mainwindow.h"
diff --git a/tests/polarcharttest/mainwindow.h b/tests/polarcharttest/mainwindow.h
index c16a292e..2257ef04 100644
--- a/tests/polarcharttest/mainwindow.h
+++ b/tests/polarcharttest/mainwindow.h
@@ -21,14 +21,14 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QPolarChart>
-#include <QMainWindow>
-#include <QFont>
-#include <QChart>
-#include <QScatterSeries>
-#include <QLineSeries>
-#include <QSplineSeries>
-#include <QAreaSeries>
+#include <QtCharts/QPolarChart>
+#include <QtWidgets/QMainWindow>
+#include <QtGui/QFont>
+#include <QtCharts/QChart>
+#include <QtCharts/QScatterSeries>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QSplineSeries>
+#include <QtCharts/QAreaSeries>
 
 namespace Ui {
 class MainWindow;
diff --git a/tests/presenterchart/chartview.cpp b/tests/presenterchart/chartview.cpp
index efebadc0..be01933c 100644
--- a/tests/presenterchart/chartview.cpp
+++ b/tests/presenterchart/chartview.cpp
@@ -19,11 +19,11 @@
 ****************************************************************************/
 
 #include "chartview.h"
-#include <QLineSeries>
-#include <QScatterSeries>
-#include <QSplineSeries>
-#include <QAreaSeries>
-#include <QTime>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QScatterSeries>
+#include <QtCharts/QSplineSeries>
+#include <QtCharts/QAreaSeries>
+#include <QtCore/QTime>
 
 ChartView::ChartView(QChart *chart, QWidget *parent)
     : QChartView(chart, parent),
diff --git a/tests/presenterchart/chartview.h b/tests/presenterchart/chartview.h
index 8753a11b..99d8c65a 100644
--- a/tests/presenterchart/chartview.h
+++ b/tests/presenterchart/chartview.h
@@ -21,8 +21,8 @@
 #ifndef CHARTVIEW_H
 #define CHARTVIEW_H
 
-#include <QChartView>
-#include <QTimer>
+#include <QtCharts/QChartView>
+#include <QtCore/QTimer>
 
 QT_CHARTS_USE_NAMESPACE
 
diff --git a/tests/presenterchart/main.cpp b/tests/presenterchart/main.cpp
index 12a48faa..22a45025 100644
--- a/tests/presenterchart/main.cpp
+++ b/tests/presenterchart/main.cpp
@@ -19,8 +19,8 @@
 ****************************************************************************/
 
 #include "chartview.h"
-#include <QApplication>
-#include <QMainWindow>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMainWindow>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/qmlchartaxis/main.cpp b/tests/qmlchartaxis/main.cpp
index fb4d56f8..5c5923c7 100644
--- a/tests/qmlchartaxis/main.cpp
+++ b/tests/qmlchartaxis/main.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QtCore/QDir>
 #include <QtQuick/QQuickView>
 #include <QtQml/QQmlEngine>
diff --git a/tests/qmlchartproperties/main.cpp b/tests/qmlchartproperties/main.cpp
index 6eb3c801..752724be 100644
--- a/tests/qmlchartproperties/main.cpp
+++ b/tests/qmlchartproperties/main.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QtCore/QDir>
 #include <QtQuick/QQuickView>
 #include <QtQml/QQmlEngine>
diff --git a/tests/tests.pri b/tests/tests.pri
index 1a723c59..8748acf1 100644
--- a/tests/tests.pri
+++ b/tests/tests.pri
@@ -1,6 +1,3 @@
-INCLUDEPATH += ../../include
-
-LIBS += -L$$OUT_PWD/../../lib
 TEMPLATE = app
 
 QT += charts
diff --git a/tests/wavechart/main.cpp b/tests/wavechart/main.cpp
index 2d7a4f21..58423319 100644
--- a/tests/wavechart/main.cpp
+++ b/tests/wavechart/main.cpp
@@ -19,9 +19,9 @@
 ****************************************************************************/
 
 #include "wavechart.h"
-#include <QApplication>
-#include <QMainWindow>
-#include <QGLWidget>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMainWindow>
+#include <QtOpenGL/QGLWidget>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/wavechart/wavechart.h b/tests/wavechart/wavechart.h
index 336fa151..95978861 100644
--- a/tests/wavechart/wavechart.h
+++ b/tests/wavechart/wavechart.h
@@ -21,11 +21,11 @@
 #ifndef WAVECHART_H
 #define WAVECHART_H
 
-#include <QTimer>
-#include <QTime>
-#include <QObject>
-#include <QLineSeries>
-#include <QChartView>
+#include <QtCore/QTimer>
+#include <QtCore/QTime>
+#include <QtCore/QObject>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QChartView>
 
 QT_CHARTS_USE_NAMESPACE