diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:05:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:05:41 +0100 |
| commit | ee145bb92cda5269bf5f7a426af04386256a792b (patch) | |
| tree | d8b239c722b5af4e89b353ccc82d1ff35147d694 /src/charts/xychart | |
| parent | 9700d6ce42d4e2a644f3ad91bdbd2448e1d50feb (diff) | |
| parent | 05f5f9a6f949522a92bd5bfe520358c2ba123d7b (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I90e4a4f377c2a70a87ae59eb72ba7432b6b0cdef
Diffstat (limited to 'src/charts/xychart')
| -rw-r--r-- | src/charts/xychart/glxyseriesdata_p.h | 3 | ||||
| -rw-r--r-- | src/charts/xychart/qxymodelmapper_p.h | 3 | ||||
| -rw-r--r-- | src/charts/xychart/qxyseries_p.h | 3 | ||||
| -rw-r--r-- | src/charts/xychart/xychart_p.h | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/src/charts/xychart/glxyseriesdata_p.h b/src/charts/xychart/glxyseriesdata_p.h index 4a22e575..a5322d50 100644 --- a/src/charts/xychart/glxyseriesdata_p.h +++ b/src/charts/xychart/glxyseriesdata_p.h @@ -42,6 +42,7 @@ #include <QtCore/QMap> #include <QtCharts/QAbstractSeries> #include <QtCharts/QXYSeries> +#include <QtCharts/private/qchartglobal_p.h> #include <QtGui/QVector3D> #include <QtGui/QVector2D> #include <QtGui/QMatrix4x4> @@ -78,7 +79,7 @@ public: typedef QMap<const QXYSeries *, GLXYSeriesData *> GLXYDataMap; typedef QMapIterator<const QXYSeries *, GLXYSeriesData *> GLXYDataMapIterator; -class GLXYSeriesDataManager : public QObject +class QT_CHARTS_PRIVATE_EXPORT GLXYSeriesDataManager : public QObject { Q_OBJECT diff --git a/src/charts/xychart/qxymodelmapper_p.h b/src/charts/xychart/qxymodelmapper_p.h index d2a1b095..daa82342 100644 --- a/src/charts/xychart/qxymodelmapper_p.h +++ b/src/charts/xychart/qxymodelmapper_p.h @@ -40,6 +40,7 @@ #define QXYMODELMAPPER_P_H #include <QtCharts/QXYModelMapper> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QObject> QT_BEGIN_NAMESPACE @@ -53,7 +54,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QXYModelMapper; class QXYSeries; -class QXYModelMapperPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QXYModelMapperPrivate : public QObject { Q_OBJECT diff --git a/src/charts/xychart/qxyseries_p.h b/src/charts/xychart/qxyseries_p.h index 2579d925..f803c52a 100644 --- a/src/charts/xychart/qxyseries_p.h +++ b/src/charts/xychart/qxyseries_p.h @@ -40,13 +40,14 @@ #define QXYSERIES_P_H #include <private/qabstractseries_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QXYSeries; class QAbstractAxis; -class QXYSeriesPrivate: public QAbstractSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QXYSeriesPrivate: public QAbstractSeriesPrivate { Q_OBJECT diff --git a/src/charts/xychart/xychart_p.h b/src/charts/xychart/xychart_p.h index c5737cca..64c51f33 100644 --- a/src/charts/xychart/xychart_p.h +++ b/src/charts/xychart/xychart_p.h @@ -43,6 +43,7 @@ #include <private/chartitem_p.h> #include <private/xyanimation_p.h> #include <QtCharts/QValueAxis> +#include <QtCharts/private/qchartglobal_p.h> #include <QtGui/QPen> QT_CHARTS_BEGIN_NAMESPACE @@ -50,7 +51,7 @@ QT_CHARTS_BEGIN_NAMESPACE class ChartPresenter; class QXYSeries; -class XYChart : public ChartItem +class QT_CHARTS_PRIVATE_EXPORT XYChart : public ChartItem { Q_OBJECT public: |