diff options
Diffstat (limited to 'tests/chartdesigner')
-rw-r--r-- | tests/chartdesigner/brushwidget.h | 2 | ||||
-rw-r--r-- | tests/chartdesigner/engine.cpp | 30 | ||||
-rw-r--r-- | tests/chartdesigner/engine.h | 6 | ||||
-rw-r--r-- | tests/chartdesigner/main.cpp | 2 | ||||
-rw-r--r-- | tests/chartdesigner/mainwindow.cpp | 22 | ||||
-rw-r--r-- | tests/chartdesigner/mainwindow.h | 6 | ||||
-rw-r--r-- | tests/chartdesigner/objectinspectorwidget.cpp | 6 | ||||
-rw-r--r-- | tests/chartdesigner/objectinspectorwidget.h | 2 | ||||
-rw-r--r-- | tests/chartdesigner/penwidget.cpp | 6 | ||||
-rw-r--r-- | tests/chartdesigner/penwidget.h | 4 |
10 files changed, 43 insertions, 43 deletions
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; |