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/axis/datetimeaxis | |
| parent | 9700d6ce42d4e2a644f3ad91bdbd2448e1d50feb (diff) | |
| parent | 05f5f9a6f949522a92bd5bfe520358c2ba123d7b (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I90e4a4f377c2a70a87ae59eb72ba7432b6b0cdef
Diffstat (limited to 'src/charts/axis/datetimeaxis')
5 files changed, 10 insertions, 5 deletions
diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h b/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h index 454e089d..dde0c998 100644 --- a/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h +++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h @@ -40,12 +40,13 @@ #define CHARTDATETIMEAXISX_H #include <private/horizontalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxis; -class ChartDateTimeAxisX : public HorizontalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartDateTimeAxisX : public HorizontalAxis { Q_OBJECT public: diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h b/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h index b84ca9e6..b7346d52 100644 --- a/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h +++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h @@ -40,12 +40,13 @@ #define CHARTDATETIMEAXISY_H #include <private/verticalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxis; -class ChartDateTimeAxisY : public VerticalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartDateTimeAxisY : public VerticalAxis { Q_OBJECT public: diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h index ba47a99b..c15362cd 100644 --- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h +++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h @@ -40,12 +40,13 @@ #define POLARCHARTDATETIMEAXISANGULAR_P_H #include <private/polarchartaxisangular_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxis; -class PolarChartDateTimeAxisAngular : public PolarChartAxisAngular +class QT_CHARTS_PRIVATE_EXPORT PolarChartDateTimeAxisAngular : public PolarChartAxisAngular { Q_OBJECT public: diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h index 8ecb8813..4d22278f 100644 --- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h +++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h @@ -40,12 +40,13 @@ #define POLARCHARTDATETIMEAXISRADIAL_P_H #include <private/polarchartaxisradial_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxis; -class PolarChartDateTimeAxisRadial : public PolarChartAxisRadial +class QT_CHARTS_PRIVATE_EXPORT PolarChartDateTimeAxisRadial : public PolarChartAxisRadial { Q_OBJECT public: diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h b/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h index 468d6999..42483a06 100644 --- a/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h +++ b/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h @@ -40,12 +40,13 @@ #define QDATETIMEAXIS_P_H #include <QtCharts/QDateTimeAxis> +#include <QtCharts/private/qchartglobal_p.h> #include <private/qabstractaxis_p.h> #include <QtCore/QDateTime> QT_CHARTS_BEGIN_NAMESPACE -class QDateTimeAxisPrivate : public QAbstractAxisPrivate +class QT_CHARTS_PRIVATE_EXPORT QDateTimeAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT public: |