diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-03-11 11:44:28 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-04-01 11:31:55 +0300 |
| commit | 7b74d88b3f3df27d3f74e88e2ceed75b65bce2e5 (patch) | |
| tree | ff045779a4a4ef4f9a94170e2140b581ae6181e5 /tests/manual | |
| parent | 7a4cd1d34c0861cde1ba49e8aca7d30810e2d812 (diff) | |
Fix compilation with namespaced Qt.
Change-Id: I359bbf5c89bd23bb1b6db1aeed8a2a4aa2ca12bf
Reviewed-by: Andre Poenitz <andre.poenitz@theqtcompany.com>
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/boxplottester/mainwidget.h | 3 | ||||
| -rw-r--r-- | tests/manual/boxplottester/pentool.h | 2 | ||||
| -rw-r--r-- | tests/manual/chartviewer/grid.h | 3 | ||||
| -rw-r--r-- | tests/manual/chartviewer/view.h | 2 | ||||
| -rw-r--r-- | tests/manual/chartviewer/window.h | 6 | ||||
| -rw-r--r-- | tests/manual/chartwidgettest/dataseriedialog.h | 2 | ||||
| -rw-r--r-- | tests/manual/chartwidgettest/mainwidget.h | 2 | ||||
| -rw-r--r-- | tests/manual/polarcharttest/mainwindow.h | 9 |
8 files changed, 24 insertions, 5 deletions
diff --git a/tests/manual/boxplottester/mainwidget.h b/tests/manual/boxplottester/mainwidget.h index 5e656425..b4b4c428 100644 --- a/tests/manual/boxplottester/mainwidget.h +++ b/tests/manual/boxplottester/mainwidget.h @@ -29,7 +29,10 @@ #include <QtWidgets/QCheckBox> #include <QtWidgets/QDoubleSpinBox> +QT_BEGIN_NAMESPACE class QGridLayout; +QT_END_NAMESPACE + class CustomTableModel; class PenTool; diff --git a/tests/manual/boxplottester/pentool.h b/tests/manual/boxplottester/pentool.h index 009c58d9..62776bca 100644 --- a/tests/manual/boxplottester/pentool.h +++ b/tests/manual/boxplottester/pentool.h @@ -21,9 +21,11 @@ #include <QtWidgets/QWidget> #include <QtGui/QPen> +QT_BEGIN_NAMESPACE class QPushButton; class QDoubleSpinBox; class QComboBox; +QT_END_NAMESPACE class PenTool : public QWidget { diff --git a/tests/manual/chartviewer/grid.h b/tests/manual/chartviewer/grid.h index 74eec0ea..42a6b8e6 100644 --- a/tests/manual/chartviewer/grid.h +++ b/tests/manual/chartviewer/grid.h @@ -23,7 +23,10 @@ #include <QtWidgets/QGraphicsWidget> #include <QtCharts/QChartGlobal> +QT_BEGIN_NAMESPACE class QGraphicsGridLayout; +QT_END_NAMESPACE + class Chart; QT_CHARTS_BEGIN_NAMESPACE diff --git a/tests/manual/chartviewer/view.h b/tests/manual/chartviewer/view.h index a5bac1b3..b5cdcdc0 100644 --- a/tests/manual/chartviewer/view.h +++ b/tests/manual/chartviewer/view.h @@ -20,8 +20,10 @@ #define VIEW_H #include <QtWidgets/QGraphicsView> +QT_BEGIN_NAMESPACE class QGraphicsScene; class QResizeEvent; +QT_END_NAMESPACE class View: public QGraphicsView { diff --git a/tests/manual/chartviewer/window.h b/tests/manual/chartviewer/window.h index 7419735f..1c9f6ac6 100644 --- a/tests/manual/chartviewer/window.h +++ b/tests/manual/chartviewer/window.h @@ -23,15 +23,17 @@ #include <QtCore/QHash> #include <QtWidgets/QComboBox> +QT_BEGIN_NAMESPACE class QCheckBox; +class QGraphicsLinearLayout; class QGraphicsRectItem; class QGraphicsScene; class QGraphicsWidget; +QT_END_NAMESPACE + class View; -class QGraphicsLinearLayout; class Chart; class Grid; -class QPushButton; QT_CHARTS_BEGIN_NAMESPACE class QChart; diff --git a/tests/manual/chartwidgettest/dataseriedialog.h b/tests/manual/chartwidgettest/dataseriedialog.h index f90b9ae1..f5f1d748 100644 --- a/tests/manual/chartwidgettest/dataseriedialog.h +++ b/tests/manual/chartwidgettest/dataseriedialog.h @@ -21,8 +21,10 @@ #include <QtWidgets/QDialog> +QT_BEGIN_NAMESPACE class QGroupBox; class QCheckBox; +QT_END_NAMESPACE class DataSerieDialog : public QDialog { diff --git a/tests/manual/chartwidgettest/mainwidget.h b/tests/manual/chartwidgettest/mainwidget.h index c27f8119..b11bd53f 100644 --- a/tests/manual/chartwidgettest/mainwidget.h +++ b/tests/manual/chartwidgettest/mainwidget.h @@ -24,9 +24,11 @@ #include <QtCharts/QChartView> #include <QtWidgets/QWidget> +QT_BEGIN_NAMESPACE class QSpinBox; class QCheckBox; class QGridLayout; +QT_END_NAMESPACE QT_CHARTS_USE_NAMESPACE diff --git a/tests/manual/polarcharttest/mainwindow.h b/tests/manual/polarcharttest/mainwindow.h index 237e262a..1e6f21ca 100644 --- a/tests/manual/polarcharttest/mainwindow.h +++ b/tests/manual/polarcharttest/mainwindow.h @@ -28,14 +28,17 @@ #include <QtCharts/QSplineSeries> #include <QtCharts/QAreaSeries> +QT_BEGIN_NAMESPACE +class QBrush; +class QPen; + namespace Ui { class MainWindow; } +QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE -class QBrush; -class QPen; +QT_CHARTS_USE_NAMESPACE class MainWindow : public QMainWindow { |