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/vertical | |
| 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/vertical')
6 files changed, 12 insertions, 6 deletions
diff --git a/src/charts/barchart/vertical/bar/barchartitem_p.h b/src/charts/barchart/vertical/bar/barchartitem_p.h index ef5f5220..174eaa7a 100644 --- a/src/charts/barchart/vertical/bar/barchartitem_p.h +++ b/src/charts/barchart/vertical/bar/barchartitem_p.h @@ -43,10 +43,11 @@ #include <private/abstractbarchartitem_p.h> #include <QtCharts/QStackedBarSeries> #include <QtWidgets/QGraphicsItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class BarChartItem : public AbstractBarChartItem +class QT_CHARTS_PRIVATE_EXPORT BarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/vertical/bar/qbarseries_p.h b/src/charts/barchart/vertical/bar/qbarseries_p.h index 620c57f4..270ac4bc 100644 --- a/src/charts/barchart/vertical/bar/qbarseries_p.h +++ b/src/charts/barchart/vertical/bar/qbarseries_p.h @@ -41,11 +41,12 @@ #include <private/qabstractbarseries_p.h> #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QBarSeriesPrivate(QBarSeries *q); diff --git a/src/charts/barchart/vertical/percent/percentbarchartitem_p.h b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h index 80016613..a922f62d 100644 --- a/src/charts/barchart/vertical/percent/percentbarchartitem_p.h +++ b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h @@ -42,12 +42,13 @@ #include <private/abstractbarchartitem_p.h> #include <QtWidgets/QGraphicsItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QAbstractBarSeries; -class PercentBarChartItem : public AbstractBarChartItem +class QT_CHARTS_PRIVATE_EXPORT PercentBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries_p.h b/src/charts/barchart/vertical/percent/qpercentbarseries_p.h index 8cd95f2e..7a422410 100644 --- a/src/charts/barchart/vertical/percent/qpercentbarseries_p.h +++ b/src/charts/barchart/vertical/percent/qpercentbarseries_p.h @@ -41,11 +41,12 @@ #include <private/qabstractbarseries_p.h> #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QPercentBarSeriesPrivate(QPercentBarSeries *q); diff --git a/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h b/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h index 588d9e64..94916dfe 100644 --- a/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h +++ b/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h @@ -41,11 +41,12 @@ #include <private/qabstractbarseries_p.h> #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QStackedBarSeriesPrivate(QStackedBarSeries *q); diff --git a/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h b/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h index 03010e16..58ea7264 100644 --- a/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h +++ b/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h @@ -43,10 +43,11 @@ #include <private/abstractbarchartitem_p.h> #include <QtCharts/QStackedBarSeries> #include <QtWidgets/QGraphicsItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class StackedBarChartItem : public AbstractBarChartItem +class QT_CHARTS_PRIVATE_EXPORT StackedBarChartItem : public AbstractBarChartItem { Q_OBJECT public: |