diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-04 15:53:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-04 14:03:30 +0000 |
| commit | bf72b8bb97b727d2c0bbb2a8c1db0a42bd1fa789 (patch) | |
| tree | 7a10564ef2baa64d12819ac90f47d03337975d15 /src/charts/xychart | |
| parent | a93849d026172cbd9197c15997eeea2a73c6b155 (diff) | |
Fix namespaced build
It is not allowed to include files within Qt namespace.
This amends a93849d0.
See 5b99f3a3 in qtbase dev.
Task-number: QTBUG-70907
Change-Id: I37f0924429313f2251f656bcd5b6b248a22ccfbb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/charts/xychart')
| -rw-r--r-- | src/charts/xychart/qhxymodelmapper.cpp | 4 | ||||
| -rw-r--r-- | src/charts/xychart/qvxymodelmapper.cpp | 4 | ||||
| -rw-r--r-- | src/charts/xychart/qxymodelmapper.cpp | 4 | ||||
| -rw-r--r-- | src/charts/xychart/qxyseries.cpp | 4 | ||||
| -rw-r--r-- | src/charts/xychart/xychart.cpp | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/charts/xychart/qhxymodelmapper.cpp b/src/charts/xychart/qhxymodelmapper.cpp index b2b08bc0..f11201c2 100644 --- a/src/charts/xychart/qhxymodelmapper.cpp +++ b/src/charts/xychart/qhxymodelmapper.cpp @@ -271,6 +271,6 @@ void QHXYModelMapper::setColumnCount(int columnCount) } } -#include "moc_qhxymodelmapper.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qhxymodelmapper.cpp" diff --git a/src/charts/xychart/qvxymodelmapper.cpp b/src/charts/xychart/qvxymodelmapper.cpp index 8b176b78..9b5655b7 100644 --- a/src/charts/xychart/qvxymodelmapper.cpp +++ b/src/charts/xychart/qvxymodelmapper.cpp @@ -268,6 +268,6 @@ void QVXYModelMapper::setRowCount(int rowCount) } } -#include "moc_qvxymodelmapper.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qvxymodelmapper.cpp" diff --git a/src/charts/xychart/qxymodelmapper.cpp b/src/charts/xychart/qxymodelmapper.cpp index b8930621..f3ed4e43 100644 --- a/src/charts/xychart/qxymodelmapper.cpp +++ b/src/charts/xychart/qxymodelmapper.cpp @@ -573,7 +573,7 @@ void QXYModelMapperPrivate::initializeXYFromModel() blockSeriesSignals(false); } +QT_CHARTS_END_NAMESPACE + #include "moc_qxymodelmapper.cpp" #include "moc_qxymodelmapper_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/xychart/qxyseries.cpp b/src/charts/xychart/qxyseries.cpp index 81bdcd16..8069ade9 100644 --- a/src/charts/xychart/qxyseries.cpp +++ b/src/charts/xychart/qxyseries.cpp @@ -1029,7 +1029,7 @@ void QXYSeriesPrivate::drawSeriesPointLabels(QPainter *painter, const QVector<QP } } +QT_CHARTS_END_NAMESPACE + #include "moc_qxyseries.cpp" #include "moc_qxyseries_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/xychart/xychart.cpp b/src/charts/xychart/xychart.cpp index a6432fd7..2b82d6d5 100644 --- a/src/charts/xychart/xychart.cpp +++ b/src/charts/xychart/xychart.cpp @@ -250,6 +250,6 @@ bool XYChart::isEmpty() return domain()->isEmpty() || m_series->points().isEmpty(); } -#include "moc_xychart_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_xychart_p.cpp" |