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/barchart/horizontal | |
| parent | 9700d6ce42d4e2a644f3ad91bdbd2448e1d50feb (diff) | |
| parent | 05f5f9a6f949522a92bd5bfe520358c2ba123d7b (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I90e4a4f377c2a70a87ae59eb72ba7432b6b0cdef
Diffstat (limited to 'src/charts/barchart/horizontal')
6 files changed, 12 insertions, 6 deletions
diff --git a/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h b/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h index 9f616768..d9d5c515 100644 --- a/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h +++ b/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h @@ -41,10 +41,11 @@ #include <private/abstractbarchartitem_p.h> #include <QtWidgets/QGraphicsItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class HorizontalBarChartItem : public AbstractBarChartItem +class QT_CHARTS_PRIVATE_EXPORT HorizontalBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h b/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h index efdaf4ff..650bad5f 100644 --- a/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h +++ b/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h @@ -41,10 +41,11 @@ #include <private/qabstractbarseries_p.h> #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QHorizontalBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QHorizontalBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QHorizontalBarSeriesPrivate(QHorizontalBarSeries *q); diff --git a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h index 51180258..bff54e9b 100644 --- a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h +++ b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h @@ -41,10 +41,11 @@ #include <private/abstractbarchartitem_p.h> #include <QtWidgets/QGraphicsItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class HorizontalPercentBarChartItem : public AbstractBarChartItem +class QT_CHARTS_PRIVATE_EXPORT HorizontalPercentBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h index f4a74917..e17381ff 100644 --- a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h +++ b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h @@ -41,10 +41,11 @@ #include <private/qabstractbarseries_p.h> #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QHorizontalPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QHorizontalPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QHorizontalPercentBarSeriesPrivate(QHorizontalPercentBarSeries *q); diff --git a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h index 4fb8ce27..d3744490 100644 --- a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h +++ b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h @@ -40,11 +40,12 @@ #define HORIZONTALSTACKEDBARCHARTITEM_P_H #include <private/abstractbarchartitem_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtWidgets/QGraphicsItem> QT_CHARTS_BEGIN_NAMESPACE -class HorizontalStackedBarChartItem : public AbstractBarChartItem +class QT_CHARTS_PRIVATE_EXPORT HorizontalStackedBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h index 893510d3..1c3e014e 100644 --- a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h +++ b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h @@ -41,10 +41,11 @@ #include <private/qabstractbarseries_p.h> #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QHorizontalStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QHorizontalStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries *q); |