diff options
| author | Peter Staab <peter.staab76@gmail.com> | 2018-01-19 09:48:10 +0100 |
|---|---|---|
| committer | Peter Staab <peter.staab76@gmail.com> | 2018-01-23 11:47:55 +0000 |
| commit | 47f3f659d2c4bae874f78998aece8145605bfd50 (patch) | |
| tree | 06bc11f59dcfe509c99efbf38b436208374a56db /src | |
| parent | 175d864fbb96ed64cc609fe08df4b28668368040 (diff) | |
Add export declarations to private headers
Export declarations were missing in the private headers.
Task-number: QTBUG-65774
Change-Id: I933c2cd151563747d0159c78bca70a768dc82835
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src')
138 files changed, 328 insertions, 141 deletions
diff --git a/src/charts/animations/axisanimation_p.h b/src/charts/animations/axisanimation_p.h index c9980d17..42cf8081 100644 --- a/src/charts/animations/axisanimation_p.h +++ b/src/charts/animations/axisanimation_p.h @@ -40,13 +40,14 @@ #define AXISANIMATION_H #include <private/chartanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QPointF> QT_CHARTS_BEGIN_NAMESPACE class ChartAxisElement; -class AxisAnimation: public ChartAnimation +class QT_CHARTS_PRIVATE_EXPORT AxisAnimation: public ChartAnimation { public: enum Animation { DefaultAnimation, ZoomOutAnimation, ZoomInAnimation, MoveForwardAnimation, MoveBackwordAnimation}; diff --git a/src/charts/animations/baranimation_p.h b/src/charts/animations/baranimation_p.h index 6fc8d224..c27765d0 100644 --- a/src/charts/animations/baranimation_p.h +++ b/src/charts/animations/baranimation_p.h @@ -40,12 +40,13 @@ #define BARANIMATION_P_H #include <private/chartanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class AbstractBarChartItem; -class BarAnimation : public ChartAnimation +class QT_CHARTS_PRIVATE_EXPORT BarAnimation : public ChartAnimation { Q_OBJECT diff --git a/src/charts/animations/boxplotanimation_p.h b/src/charts/animations/boxplotanimation_p.h index 75ebd749..0f3cb388 100644 --- a/src/charts/animations/boxplotanimation_p.h +++ b/src/charts/animations/boxplotanimation_p.h @@ -43,12 +43,13 @@ #include <private/boxwhiskers_p.h> #include <private/boxwhiskersdata_p.h> #include <private/boxwhiskersanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class BoxPlotChartItem; -class BoxPlotAnimation : public QObject +class QT_CHARTS_PRIVATE_EXPORT BoxPlotAnimation : public QObject { Q_OBJECT public: diff --git a/src/charts/animations/boxwhiskersanimation_p.h b/src/charts/animations/boxwhiskersanimation_p.h index e72f68c2..99e26d7b 100644 --- a/src/charts/animations/boxwhiskersanimation_p.h +++ b/src/charts/animations/boxwhiskersanimation_p.h @@ -42,13 +42,14 @@ #include <private/chartanimation_p.h> #include <private/boxwhiskers_p.h> #include <private/boxwhiskersdata_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class BoxPlotChartItem; class BoxPlotAnimation; -class BoxWhiskersAnimation : public ChartAnimation +class QT_CHARTS_PRIVATE_EXPORT BoxWhiskersAnimation : public ChartAnimation { Q_OBJECT diff --git a/src/charts/animations/candlestickanimation_p.h b/src/charts/animations/candlestickanimation_p.h index cb894cd7..c1b82db6 100644 --- a/src/charts/animations/candlestickanimation_p.h +++ b/src/charts/animations/candlestickanimation_p.h @@ -40,6 +40,7 @@ #define CANDLESTICKANIMATION_P_H #include <private/chartanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -47,7 +48,7 @@ class Candlestick; class CandlestickChartItem; class CandlestickBodyWicksAnimation; -class CandlestickAnimation : public QObject +class QT_CHARTS_PRIVATE_EXPORT CandlestickAnimation : public QObject { Q_OBJECT diff --git a/src/charts/animations/candlestickbodywicksanimation_p.h b/src/charts/animations/candlestickbodywicksanimation_p.h index a8d30f04..4a79cd38 100644 --- a/src/charts/animations/candlestickbodywicksanimation_p.h +++ b/src/charts/animations/candlestickbodywicksanimation_p.h @@ -41,13 +41,14 @@ #include <private/candlestickdata_p.h> #include <private/chartanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class Candlestick; class CandlestickAnimation; -class CandlestickBodyWicksAnimation : public ChartAnimation +class QT_CHARTS_PRIVATE_EXPORT CandlestickBodyWicksAnimation : public ChartAnimation { Q_OBJECT diff --git a/src/charts/animations/chartanimation_p.h b/src/charts/animations/chartanimation_p.h index 86564b28..87d552b5 100644 --- a/src/charts/animations/chartanimation_p.h +++ b/src/charts/animations/chartanimation_p.h @@ -41,12 +41,13 @@ #include <QtCharts/QChartGlobal> #include <QtCore/QVariantAnimation> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE const static int ChartAnimationDuration = 1000; -class ChartAnimation: public QVariantAnimation +class QT_CHARTS_PRIVATE_EXPORT ChartAnimation: public QVariantAnimation { Q_OBJECT public: diff --git a/src/charts/animations/pieanimation_p.h b/src/charts/animations/pieanimation_p.h index 791bac52..de3c5ebc 100644 --- a/src/charts/animations/pieanimation_p.h +++ b/src/charts/animations/pieanimation_p.h @@ -42,12 +42,13 @@ #include <private/chartanimation_p.h> #include <private/piechartitem_p.h> #include <private/piesliceanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class PieChartItem; -class PieAnimation : public ChartAnimation +class QT_CHARTS_PRIVATE_EXPORT PieAnimation : public ChartAnimation { Q_OBJECT diff --git a/src/charts/animations/piesliceanimation_p.h b/src/charts/animations/piesliceanimation_p.h index 2ba03735..de962d51 100644 --- a/src/charts/animations/piesliceanimation_p.h +++ b/src/charts/animations/piesliceanimation_p.h @@ -41,12 +41,13 @@ #include <private/chartanimation_p.h> #include <private/piesliceitem_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class PieChartItem; -class PieSliceAnimation : public ChartAnimation +class QT_CHARTS_PRIVATE_EXPORT PieSliceAnimation : public ChartAnimation { public: PieSliceAnimation(PieSliceItem *sliceItem); diff --git a/src/charts/animations/scatteranimation_p.h b/src/charts/animations/scatteranimation_p.h index 56b9f2e5..6df74417 100644 --- a/src/charts/animations/scatteranimation_p.h +++ b/src/charts/animations/scatteranimation_p.h @@ -38,13 +38,15 @@ #ifndef SCATTERANIMATION_P_H #define SCATTERANIMATION_P_H + #include <private/xyanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class ScatterChartItem; -class ScatterAnimation : public XYAnimation +class QT_CHARTS_PRIVATE_EXPORT ScatterAnimation : public XYAnimation { public: ScatterAnimation(ScatterChartItem *item, int duration, QEasingCurve &curve); diff --git a/src/charts/animations/splineanimation_p.h b/src/charts/animations/splineanimation_p.h index 1744a594..11261aa7 100644 --- a/src/charts/animations/splineanimation_p.h +++ b/src/charts/animations/splineanimation_p.h @@ -38,7 +38,9 @@ #ifndef SPLINEANIMATION_P_H #define SPLINEANIMATION_P_H + #include <private/xyanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QPointF> typedef QPair<QVector<QPointF >, QVector<QPointF > > SplineVector; @@ -47,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class SplineChartItem; -class SplineAnimation : public XYAnimation +class QT_CHARTS_PRIVATE_EXPORT SplineAnimation : public XYAnimation { public: SplineAnimation(SplineChartItem *item, int duration, QEasingCurve &curve); diff --git a/src/charts/animations/xyanimation_p.h b/src/charts/animations/xyanimation_p.h index 1a018d3b..e0f7937b 100644 --- a/src/charts/animations/xyanimation_p.h +++ b/src/charts/animations/xyanimation_p.h @@ -40,13 +40,14 @@ #define XYANIMATION_P_H #include <private/chartanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QPointF> QT_CHARTS_BEGIN_NAMESPACE class XYChart; -class XYAnimation : public ChartAnimation +class QT_CHARTS_PRIVATE_EXPORT XYAnimation : public ChartAnimation { protected: enum Animation { AddPointAnimation, RemovePointAnimation, ReplacePointAnimation, NewAnimation }; diff --git a/src/charts/areachart/areachartitem_p.h b/src/charts/areachart/areachartitem_p.h index be943877..3546d330 100644 --- a/src/charts/areachart/areachartitem_p.h +++ b/src/charts/areachart/areachartitem_p.h @@ -41,6 +41,7 @@ #include <QtCharts/QChartGlobal> #include <private/linechartitem_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCharts/QAreaSeries> #include <QtGui/QPen> @@ -48,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class AreaChartItem; -class AreaChartItem : public ChartItem +class QT_CHARTS_PRIVATE_EXPORT AreaChartItem : public ChartItem { Q_OBJECT public: @@ -113,7 +114,7 @@ private: }; -class AreaBoundItem : public LineChartItem +class QT_CHARTS_PRIVATE_EXPORT AreaBoundItem : public LineChartItem { public: AreaBoundItem(AreaChartItem *area, QLineSeries *lineSeries,QGraphicsItem* item = 0) diff --git a/src/charts/areachart/qareaseries_p.h b/src/charts/areachart/qareaseries_p.h index 0de00597..a4d46169 100644 --- a/src/charts/areachart/qareaseries_p.h +++ b/src/charts/areachart/qareaseries_p.h @@ -40,13 +40,14 @@ #define QAREASERIES_P_H #include <private/qabstractseries_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QAreaSeries; class QLineSeries; -class QAreaSeriesPrivate: public QAbstractSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QAreaSeriesPrivate: public QAbstractSeriesPrivate { Q_OBJECT diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h index b0cdbbc4..47a32a09 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h @@ -40,13 +40,14 @@ #define CHARTBARCATEGORYAXISX_H #include <private/horizontalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class ChartPresenter; class QBarCategoryAxis; -class ChartBarCategoryAxisX : public HorizontalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartBarCategoryAxisX : public HorizontalAxis { Q_OBJECT public: diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h index 26591b0d..14732ab4 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h @@ -40,13 +40,14 @@ #define CHARTBARCATEGORYAXISY_H #include <private/verticalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QBarCategoryAxis; class ChartPresenter; -class ChartBarCategoryAxisY : public VerticalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartBarCategoryAxisY : public VerticalAxis { Q_OBJECT public: diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h b/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h index 3a1b55f9..3101d041 100644 --- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h +++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h @@ -41,12 +41,13 @@ #include <QtCharts/QBarCategoryAxis> #include <private/qabstractaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class AbstractDomain; -class QBarCategoryAxisPrivate : public QAbstractAxisPrivate +class QT_CHARTS_PRIVATE_EXPORT QBarCategoryAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT diff --git a/src/charts/axis/cartesianchartaxis_p.h b/src/charts/axis/cartesianchartaxis_p.h index 5157da65..60cabd19 100644 --- a/src/charts/axis/cartesianchartaxis_p.h +++ b/src/charts/axis/cartesianchartaxis_p.h @@ -41,12 +41,13 @@ #include <QtCharts/QChartGlobal> #include <private/chartaxiselement_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QAbstractAxis; -class CartesianChartAxis : public ChartAxisElement +class QT_CHARTS_PRIVATE_EXPORT CartesianChartAxis : public ChartAxisElement { Q_OBJECT Q_INTERFACES(QGraphicsLayoutItem) diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h b/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h index e548b38c..ea42aea0 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h +++ b/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h @@ -40,12 +40,13 @@ #define CHARTCATEGORYAXISX_H #include <private/horizontalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxis; -class ChartCategoryAxisX : public HorizontalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartCategoryAxisX : public HorizontalAxis { Q_OBJECT public: diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h b/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h index 3efd52bf..9057ed14 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h +++ b/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h @@ -40,12 +40,13 @@ #define CHARTCATEGORYAXISY_H #include <private/verticalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxis; -class ChartCategoryAxisY : public VerticalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartCategoryAxisY : public VerticalAxis { Q_OBJECT public: diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h index 7bbd219b..aef99571 100644 --- a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h +++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h @@ -40,12 +40,13 @@ #define POLARCHARTCATEGORYAXISANGULAR_P_H #include <private/polarchartaxisangular_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxis; -class PolarChartCategoryAxisAngular : public PolarChartAxisAngular +class QT_CHARTS_PRIVATE_EXPORT PolarChartCategoryAxisAngular : public PolarChartAxisAngular { Q_OBJECT diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h index 30b0ed15..b5d93e80 100644 --- a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h +++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h @@ -40,12 +40,13 @@ #define POLARCHARTCATEGORYAXISRADIAL_P_H #include <private/polarchartaxisradial_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxis; -class PolarChartCategoryAxisRadial : public PolarChartAxisRadial +class QT_CHARTS_PRIVATE_EXPORT PolarChartCategoryAxisRadial : public PolarChartAxisRadial { Q_OBJECT diff --git a/src/charts/axis/categoryaxis/qcategoryaxis_p.h b/src/charts/axis/categoryaxis/qcategoryaxis_p.h index 7e10e8c0..1938fcb4 100644 --- a/src/charts/axis/categoryaxis/qcategoryaxis_p.h +++ b/src/charts/axis/categoryaxis/qcategoryaxis_p.h @@ -41,12 +41,13 @@ #include <QtCharts/QCategoryAxis> #include <private/qvalueaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE typedef QPair<qreal, qreal> Range; -class QCategoryAxisPrivate : public QValueAxisPrivate +class QT_CHARTS_PRIVATE_EXPORT QCategoryAxisPrivate : public QValueAxisPrivate { Q_OBJECT diff --git a/src/charts/axis/chartaxiselement_p.h b/src/charts/axis/chartaxiselement_p.h index f82ba5ce..085a75db 100644 --- a/src/charts/axis/chartaxiselement_p.h +++ b/src/charts/axis/chartaxiselement_p.h @@ -40,6 +40,7 @@ #define CHARTAXISELEMENT_H #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> #include <private/chartelement_p.h> #include <private/axisanimation_p.h> #include <QtWidgets/QGraphicsItem> @@ -51,7 +52,7 @@ QT_CHARTS_BEGIN_NAMESPACE class ChartPresenter; class QAbstractAxis; -class ChartAxisElement : public ChartElement, public QGraphicsLayoutItem +class QT_CHARTS_PRIVATE_EXPORT ChartAxisElement : public ChartElement, public QGraphicsLayoutItem { Q_OBJECT 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: diff --git a/src/charts/axis/horizontalaxis_p.h b/src/charts/axis/horizontalaxis_p.h index 1fe0c405..f9b4e148 100644 --- a/src/charts/axis/horizontalaxis_p.h +++ b/src/charts/axis/horizontalaxis_p.h @@ -40,10 +40,11 @@ #define HORIZONTALAXIS_P_H #include <private/cartesianchartaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class HorizontalAxis : public CartesianChartAxis +class QT_CHARTS_PRIVATE_EXPORT HorizontalAxis : public CartesianChartAxis { public: HorizontalAxis(QAbstractAxis *axis, QGraphicsItem *item = nullptr, bool intervalAxis = false); diff --git a/src/charts/axis/linearrowitem_p.h b/src/charts/axis/linearrowitem_p.h index 521444aa..58a8d12e 100644 --- a/src/charts/axis/linearrowitem_p.h +++ b/src/charts/axis/linearrowitem_p.h @@ -42,10 +42,11 @@ #include <private/chartaxiselement_p.h> #include <private/qabstractaxis_p.h> #include <QtWidgets/QGraphicsLineItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class LineArrowItem: public QGraphicsLineItem +class QT_CHARTS_PRIVATE_EXPORT LineArrowItem: public QGraphicsLineItem { public: explicit LineArrowItem(ChartAxisElement *axis, QGraphicsItem *parent = 0) diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h b/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h index 2b3f71d0..2edcd290 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h @@ -40,12 +40,13 @@ #define CHARTLOGVALUEAXISX_H #include <private/horizontalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxis; -class ChartLogValueAxisX : public HorizontalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartLogValueAxisX : public HorizontalAxis { Q_OBJECT diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h b/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h index f62cfd9d..beb5f27e 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h @@ -40,12 +40,13 @@ #define CHARTLOGVALUEAXISY_H #include <private/verticalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxis; -class ChartLogValueAxisY : public VerticalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartLogValueAxisY : public VerticalAxis { Q_OBJECT diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h index eebc4ba6..6c95597a 100644 --- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h +++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h @@ -40,12 +40,13 @@ #define POLARCHARTLOGVALUEAXISANGULAR_P_H #include <private/polarchartaxisangular_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxis; -class PolarChartLogValueAxisAngular : public PolarChartAxisAngular +class QT_CHARTS_PRIVATE_EXPORT PolarChartLogValueAxisAngular : public PolarChartAxisAngular { Q_OBJECT public: diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h index 7c6f29c7..17f8a988 100644 --- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h +++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h @@ -40,12 +40,13 @@ #define POLARCHARTLOGVALUEAXISRADIAL_P_H #include <private/polarchartaxisradial_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxis; -class PolarChartLogValueAxisRadial : public PolarChartAxisRadial +class QT_CHARTS_PRIVATE_EXPORT PolarChartLogValueAxisRadial : public PolarChartAxisRadial { Q_OBJECT public: diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h b/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h index 1c00c7eb..5f735650 100644 --- a/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h +++ b/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h @@ -41,10 +41,11 @@ #include <QtCharts/qlogvalueaxis.h> #include <private/qabstractaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QLogValueAxisPrivate : public QAbstractAxisPrivate +class QT_CHARTS_PRIVATE_EXPORT QLogValueAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT public: diff --git a/src/charts/axis/polarchartaxis_p.h b/src/charts/axis/polarchartaxis_p.h index 217bf29e..9df07e75 100644 --- a/src/charts/axis/polarchartaxis_p.h +++ b/src/charts/axis/polarchartaxis_p.h @@ -40,10 +40,11 @@ #define POLARCHARTAXIS_P_H #include <private/chartaxiselement_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class PolarChartAxis : public ChartAxisElement +class QT_CHARTS_PRIVATE_EXPORT PolarChartAxis : public ChartAxisElement { Q_OBJECT Q_INTERFACES(QGraphicsLayoutItem) diff --git a/src/charts/axis/polarchartaxisangular_p.h b/src/charts/axis/polarchartaxisangular_p.h index 1cb43ca6..ac517c4f 100644 --- a/src/charts/axis/polarchartaxisangular_p.h +++ b/src/charts/axis/polarchartaxisangular_p.h @@ -41,10 +41,11 @@ #include <QtCharts/qvalueaxis.h> #include <private/polarchartaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class PolarChartAxisAngular : public PolarChartAxis +class QT_CHARTS_PRIVATE_EXPORT PolarChartAxisAngular : public PolarChartAxis { Q_OBJECT diff --git a/src/charts/axis/polarchartaxisradial_p.h b/src/charts/axis/polarchartaxisradial_p.h index fd7fe7f2..73fbcea4 100644 --- a/src/charts/axis/polarchartaxisradial_p.h +++ b/src/charts/axis/polarchartaxisradial_p.h @@ -41,10 +41,11 @@ #include <QtCharts/qvalueaxis.h> #include <private/polarchartaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class PolarChartAxisRadial : public PolarChartAxis +class QT_CHARTS_PRIVATE_EXPORT PolarChartAxisRadial : public PolarChartAxis { Q_OBJECT diff --git a/src/charts/axis/qabstractaxis_p.h b/src/charts/axis/qabstractaxis_p.h index 556f3db4..3a635d98 100644 --- a/src/charts/axis/qabstractaxis_p.h +++ b/src/charts/axis/qabstractaxis_p.h @@ -42,6 +42,7 @@ #include <QtCharts/QAbstractAxis> #include <private/chartaxiselement_p.h> #include <QtCharts/QChart> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QDebug> QT_BEGIN_NAMESPACE @@ -57,7 +58,7 @@ class QAbstractSeries; class ChartTheme; class ChartElement; -class Q_AUTOTEST_EXPORT QAbstractAxisPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QAbstractAxisPrivate : public QObject { Q_OBJECT public: diff --git a/src/charts/axis/valueaxis/chartvalueaxisx_p.h b/src/charts/axis/valueaxis/chartvalueaxisx_p.h index 5cb7bdfa..bceb7412 100644 --- a/src/charts/axis/valueaxis/chartvalueaxisx_p.h +++ b/src/charts/axis/valueaxis/chartvalueaxisx_p.h @@ -40,12 +40,13 @@ #define CHARTVALUEAXISX_H #include <private/horizontalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QValueAxis; -class ChartValueAxisX : public HorizontalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartValueAxisX : public HorizontalAxis { Q_OBJECT public: diff --git a/src/charts/axis/valueaxis/chartvalueaxisy_p.h b/src/charts/axis/valueaxis/chartvalueaxisy_p.h index 243b49d2..2d0030d7 100644 --- a/src/charts/axis/valueaxis/chartvalueaxisy_p.h +++ b/src/charts/axis/valueaxis/chartvalueaxisy_p.h @@ -40,12 +40,13 @@ #define CHARTVALUEAXISY_H #include <private/verticalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QValueAxis; -class ChartValueAxisY : public VerticalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartValueAxisY : public VerticalAxis { Q_OBJECT public: diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h b/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h index 2897be28..8a39f510 100644 --- a/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h +++ b/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h @@ -41,12 +41,13 @@ #include <private/polarchartaxisangular_p.h> #include <QtCharts/QValueAxis> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QValueAxis; -class PolarChartValueAxisAngular : public PolarChartAxisAngular +class QT_CHARTS_PRIVATE_EXPORT PolarChartValueAxisAngular : public PolarChartAxisAngular { Q_OBJECT public: diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h b/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h index 8db1448d..8c4d4105 100644 --- a/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h +++ b/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h @@ -40,12 +40,13 @@ #define POLARCHARTVALUEAXISRADIAL_P_H #include <private/polarchartaxisradial_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QValueAxis; -class PolarChartValueAxisRadial : public PolarChartAxisRadial +class QT_CHARTS_PRIVATE_EXPORT PolarChartValueAxisRadial : public PolarChartAxisRadial { Q_OBJECT public: diff --git a/src/charts/axis/valueaxis/qvalueaxis_p.h b/src/charts/axis/valueaxis/qvalueaxis_p.h index 6e27377a..b020b0f7 100644 --- a/src/charts/axis/valueaxis/qvalueaxis_p.h +++ b/src/charts/axis/valueaxis/qvalueaxis_p.h @@ -41,10 +41,11 @@ #include <QtCharts/QValueAxis> #include <private/qabstractaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QValueAxisPrivate : public QAbstractAxisPrivate +class QT_CHARTS_PRIVATE_EXPORT QValueAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT public: diff --git a/src/charts/axis/verticalaxis_p.h b/src/charts/axis/verticalaxis_p.h index 687d03d2..ba87b83a 100644 --- a/src/charts/axis/verticalaxis_p.h +++ b/src/charts/axis/verticalaxis_p.h @@ -40,10 +40,11 @@ #define VERTICALAXIS_P_H #include <private/cartesianchartaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class VerticalAxis : public CartesianChartAxis +class QT_CHARTS_PRIVATE_EXPORT VerticalAxis : public CartesianChartAxis { public: VerticalAxis(QAbstractAxis *axis, QGraphicsItem *item = nullptr, bool intervalAxis = false); diff --git a/src/charts/barchart/abstractbarchartitem_p.h b/src/charts/barchart/abstractbarchartitem_p.h index d65b1bc9..7cb96c77 100644 --- a/src/charts/barchart/abstractbarchartitem_p.h +++ b/src/charts/barchart/abstractbarchartitem_p.h @@ -42,6 +42,7 @@ #include <private/chartitem_p.h> #include <QtCharts/QAbstractBarSeries> +#include <QtCharts/private/qchartglobal_p.h> #include <QtGui/QPen> #include <QtGui/QBrush> @@ -54,7 +55,7 @@ class BarAnimation; class QBarSetPrivate; class QAbstractAxis; -class AbstractBarChartItem : public ChartItem +class QT_CHARTS_PRIVATE_EXPORT AbstractBarChartItem : public ChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/bar_p.h b/src/charts/barchart/bar_p.h index 03fd19a7..654d88a3 100644 --- a/src/charts/barchart/bar_p.h +++ b/src/charts/barchart/bar_p.h @@ -40,6 +40,7 @@ #define BAR_H #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> #include <QtWidgets/QGraphicsRectItem> #include <QtWidgets/QGraphicsTextItem> @@ -48,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBarSet; // Single visual bar item of chart -class Bar : public QObject, public QGraphicsRectItem +class QT_CHARTS_PRIVATE_EXPORT Bar : public QObject, public QGraphicsRectItem { Q_OBJECT public: 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); diff --git a/src/charts/barchart/qabstractbarseries_p.h b/src/charts/barchart/qabstractbarseries_p.h index 62ddb420..4c00147e 100644 --- a/src/charts/barchart/qabstractbarseries_p.h +++ b/src/charts/barchart/qabstractbarseries_p.h @@ -43,6 +43,7 @@ #include <private/qabstractseries_p.h> #include <QtCore/QStringList> #include <QtCharts/QAbstractSeries> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -50,7 +51,7 @@ class QBarModelMapper; class QBarCategoryAxis; class QLegendMarker; -class QAbstractBarSeriesPrivate : public QAbstractSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QAbstractBarSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT public: diff --git a/src/charts/barchart/qbarmodelmapper_p.h b/src/charts/barchart/qbarmodelmapper_p.h index 416028c5..cf08d5aa 100644 --- a/src/charts/barchart/qbarmodelmapper_p.h +++ b/src/charts/barchart/qbarmodelmapper_p.h @@ -41,6 +41,7 @@ #include <QtCore/QObject> #include <QtCharts/QBarModelMapper> +#include <QtCharts/private/qchartglobal_p.h> QT_BEGIN_NAMESPACE class QModelIndex; @@ -50,7 +51,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBarSet; -class QBarModelMapperPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QBarModelMapperPrivate : public QObject { Q_OBJECT public: diff --git a/src/charts/barchart/qbarset_p.h b/src/charts/barchart/qbarset_p.h index bcecffe0..78876b7b 100644 --- a/src/charts/barchart/qbarset_p.h +++ b/src/charts/barchart/qbarset_p.h @@ -40,6 +40,7 @@ #define QBARSET_P_H #include <QtCharts/QBarSet> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QMap> #include <QtGui/QPen> #include <QtGui/QBrush> @@ -47,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QBarSetPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QBarSetPrivate : public QObject { Q_OBJECT 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: diff --git a/src/charts/boxplotchart/boxplotchartitem_p.h b/src/charts/boxplotchart/boxplotchartitem_p.h index 4dbe6aa1..f7a7cd9e 100644 --- a/src/charts/boxplotchart/boxplotchartitem_p.h +++ b/src/charts/boxplotchart/boxplotchartitem_p.h @@ -42,6 +42,7 @@ #include <private/boxwhiskers_p.h> #include <QtCharts/QBoxPlotSeries> +#include <QtCharts/private/qchartglobal_p.h> #include <private/chartitem_p.h> #include <private/boxplotanimation_p.h> #include <QtCharts/QBoxSet> @@ -51,7 +52,7 @@ QT_CHARTS_BEGIN_NAMESPACE class BoxPlotSeriesPrivate; -class BoxPlotChartItem : public ChartItem +class QT_CHARTS_PRIVATE_EXPORT BoxPlotChartItem : public ChartItem { Q_OBJECT public: diff --git a/src/charts/boxplotchart/boxwhiskers_p.h b/src/charts/boxplotchart/boxwhiskers_p.h index b63f5024..6ce0bf53 100644 --- a/src/charts/boxplotchart/boxwhiskers_p.h +++ b/src/charts/boxplotchart/boxwhiskers_p.h @@ -41,6 +41,7 @@ #include <private/boxwhiskersdata_p.h> #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> #include <private/abstractdomain_p.h> #include <QtCharts/QBoxSet> #include <QtWidgets/QGraphicsRectItem> @@ -52,7 +53,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBarSet; -class BoxWhiskers : public QGraphicsObject +class QT_CHARTS_PRIVATE_EXPORT BoxWhiskers : public QGraphicsObject { Q_OBJECT diff --git a/src/charts/boxplotchart/boxwhiskersdata_p.h b/src/charts/boxplotchart/boxwhiskersdata_p.h index b84a7295..3e9554f2 100644 --- a/src/charts/boxplotchart/boxwhiskersdata_p.h +++ b/src/charts/boxplotchart/boxwhiskersdata_p.h @@ -40,11 +40,12 @@ #define BOXWHISKERSDATA_P_H #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class BoxWhiskersData +class QT_CHARTS_PRIVATE_EXPORT BoxWhiskersData { public: BoxWhiskersData() : diff --git a/src/charts/boxplotchart/qboxplotmodelmapper_p.h b/src/charts/boxplotchart/qboxplotmodelmapper_p.h index 29cd77c0..4e4e2c8a 100644 --- a/src/charts/boxplotchart/qboxplotmodelmapper_p.h +++ b/src/charts/boxplotchart/qboxplotmodelmapper_p.h @@ -41,6 +41,7 @@ #include <QtCore/QObject> #include <QtCharts/QBoxPlotModelMapper> +#include <QtCharts/private/qchartglobal_p.h> QT_BEGIN_NAMESPACE class QModelIndex; @@ -48,7 +49,7 @@ QT_END_NAMESPACE QT_CHARTS_BEGIN_NAMESPACE -class QBoxSet; +class QT_CHARTS_PRIVATE_EXPORT QBoxSet; class QBoxPlotModelMapperPrivate : public QObject { diff --git a/src/charts/boxplotchart/qboxplotseries_p.h b/src/charts/boxplotchart/qboxplotseries_p.h index 786da3d1..e15ef8b7 100644 --- a/src/charts/boxplotchart/qboxplotseries_p.h +++ b/src/charts/boxplotchart/qboxplotseries_p.h @@ -43,12 +43,13 @@ #include <private/qabstractbarseries_p.h> #include <private/abstractdomain_p.h> #include <QtCharts/QBarSet> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class BoxPlotAnimation; -class QBoxPlotSeriesPrivate : public QAbstractSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QBoxPlotSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT diff --git a/src/charts/boxplotchart/qboxset_p.h b/src/charts/boxplotchart/qboxset_p.h index 17b90253..12b765b5 100644 --- a/src/charts/boxplotchart/qboxset_p.h +++ b/src/charts/boxplotchart/qboxset_p.h @@ -40,6 +40,7 @@ #define QBOXSET_P_H #include <QtCharts/QBoxSet> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QMap> #include <QtGui/QPen> #include <QtGui/QBrush> @@ -49,7 +50,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBoxPlotSeriesPrivate; -class QBoxSetPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QBoxSetPrivate : public QObject { Q_OBJECT diff --git a/src/charts/candlestickchart/candlestick_p.h b/src/charts/candlestickchart/candlestick_p.h index fb39bbfa..80f2987e 100644 --- a/src/charts/candlestickchart/candlestick_p.h +++ b/src/charts/candlestickchart/candlestick_p.h @@ -44,13 +44,14 @@ #include <QtGui/QPen> #include <QtWidgets/QGraphicsObject> #include <private/candlestickdata_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class AbstractDomain; class QCandlestickSet; -class Candlestick : public QGraphicsObject +class QT_CHARTS_PRIVATE_EXPORT Candlestick : public QGraphicsObject { Q_OBJECT diff --git a/src/charts/candlestickchart/candlestickchartitem_p.h b/src/charts/candlestickchart/candlestickchartitem_p.h index ee3b1f71..ec1c12b4 100644 --- a/src/charts/candlestickchart/candlestickchartitem_p.h +++ b/src/charts/candlestickchart/candlestickchartitem_p.h @@ -40,6 +40,7 @@ #define CANDLESTICKCHARTITEM_P_H #include <private/chartitem_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -48,7 +49,7 @@ class CandlestickAnimation; class QCandlestickSeries; class QCandlestickSet; -class CandlestickChartItem : public ChartItem +class QT_CHARTS_PRIVATE_EXPORT CandlestickChartItem : public ChartItem { Q_OBJECT diff --git a/src/charts/candlestickchart/candlestickdata_p.h b/src/charts/candlestickchart/candlestickdata_p.h index 8cb1ab8c..233d200b 100644 --- a/src/charts/candlestickchart/candlestickdata_p.h +++ b/src/charts/candlestickchart/candlestickdata_p.h @@ -40,10 +40,11 @@ #define CANDLESTICKDATA_P_H #include <QtCharts/QCandlestickSeries> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class CandlestickData +class QT_CHARTS_PRIVATE_EXPORT CandlestickData { public: CandlestickData() : diff --git a/src/charts/candlestickchart/qcandlestickmodelmapper_p.h b/src/charts/candlestickchart/qcandlestickmodelmapper_p.h index 1d046358..7c14c9e8 100644 --- a/src/charts/candlestickchart/qcandlestickmodelmapper_p.h +++ b/src/charts/candlestickchart/qcandlestickmodelmapper_p.h @@ -40,6 +40,7 @@ #define QCANDLESTICKMODELMAPPER_P_H #include <QtCharts/QCandlestickModelMapper> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QObject> QT_BEGIN_NAMESPACE @@ -50,7 +51,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QCandlestickSet; -class QCandlestickModelMapperPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QCandlestickModelMapperPrivate : public QObject { Q_OBJECT diff --git a/src/charts/candlestickchart/qcandlestickseries_p.h b/src/charts/candlestickchart/qcandlestickseries_p.h index 0994ffc7..e747f8c3 100644 --- a/src/charts/candlestickchart/qcandlestickseries_p.h +++ b/src/charts/candlestickchart/qcandlestickseries_p.h @@ -40,6 +40,7 @@ #define QCANDLESTICKSERIES_P_H #include <private/qabstractseries_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -49,7 +50,7 @@ class QCandlestickSeries; class QCandlestickSet; class QDateTimeAxis; -class QCandlestickSeriesPrivate : public QAbstractSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QCandlestickSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT diff --git a/src/charts/candlestickchart/qcandlestickset_p.h b/src/charts/candlestickchart/qcandlestickset_p.h index 327e4ee8..58cc41e5 100644 --- a/src/charts/candlestickchart/qcandlestickset_p.h +++ b/src/charts/candlestickchart/qcandlestickset_p.h @@ -40,6 +40,7 @@ #define QCANDLESTICKSET_P_H #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> #include <QtGui/QBrush> #include <QtGui/QPen> @@ -48,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QCandlestickSeriesPrivate; class QCandlestickSet; -class QCandlestickSetPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QCandlestickSetPrivate : public QObject { Q_OBJECT diff --git a/src/charts/chartbackground_p.h b/src/charts/chartbackground_p.h index 4bf9a7b3..a89f6035 100644 --- a/src/charts/chartbackground_p.h +++ b/src/charts/chartbackground_p.h @@ -41,6 +41,7 @@ #include <QtCharts/QChartGlobal> #include <QtWidgets/QGraphicsRectItem> +#include <QtCharts/private/qchartglobal_p.h> QT_BEGIN_NAMESPACE class QGraphicsDropShadowEffect; @@ -48,7 +49,7 @@ QT_END_NAMESPACE QT_CHARTS_BEGIN_NAMESPACE -class ChartBackground: public QGraphicsRectItem +class QT_CHARTS_PRIVATE_EXPORT ChartBackground: public QGraphicsRectItem { public: ChartBackground(QGraphicsItem *parent = 0); diff --git a/src/charts/chartconfig_p.h b/src/charts/chartconfig_p.h index 2c6d51fa..4ce09650 100644 --- a/src/charts/chartconfig_p.h +++ b/src/charts/chartconfig_p.h @@ -40,10 +40,11 @@ #define CHARTCONFIG_H #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartConfig +class QT_CHARTS_PRIVATE_EXPORT ChartConfig { private: ChartConfig() { diff --git a/src/charts/chartdataset_p.h b/src/charts/chartdataset_p.h index f8a1070c..00b4b2bb 100644 --- a/src/charts/chartdataset_p.h +++ b/src/charts/chartdataset_p.h @@ -42,6 +42,7 @@ #include <QtCharts/QAbstractSeries> #include <private/abstractdomain_p.h> #include <private/qabstractaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QVector> QT_CHARTS_BEGIN_NAMESPACE @@ -50,7 +51,7 @@ class QAbstractAxis; class ChartPresenter; class GLXYSeriesDataManager; -class Q_AUTOTEST_EXPORT ChartDataSet : public QObject +class QT_CHARTS_PRIVATE_EXPORT ChartDataSet : public QObject { Q_OBJECT public: diff --git a/src/charts/chartelement_p.h b/src/charts/chartelement_p.h index 97740603..f29d6e2c 100644 --- a/src/charts/chartelement_p.h +++ b/src/charts/chartelement_p.h @@ -43,6 +43,7 @@ #include <QtCore/QObject> #include <QtCore/QRect> #include <QGraphicsObject> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -53,7 +54,7 @@ class ChartThemeManager; class AbstractDomain; class ChartDataSet; -class ChartElement: public QGraphicsObject +class QT_CHARTS_PRIVATE_EXPORT ChartElement: public QGraphicsObject { public: diff --git a/src/charts/chartitem_p.h b/src/charts/chartitem_p.h index b6b30118..560764b7 100644 --- a/src/charts/chartitem_p.h +++ b/src/charts/chartitem_p.h @@ -41,11 +41,12 @@ #include <private/chartelement_p.h> #include <private/chartpresenter_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtWidgets/QGraphicsItem> QT_CHARTS_BEGIN_NAMESPACE -class ChartItem : public ChartElement +class QT_CHARTS_PRIVATE_EXPORT ChartItem : public ChartElement { Q_OBJECT enum ChartItemTypes { AXIS_ITEM = UserType + 1, XYLINE_ITEM }; diff --git a/src/charts/chartpresenter_p.h b/src/charts/chartpresenter_p.h index e3db5ff8..feda8558 100644 --- a/src/charts/chartpresenter_p.h +++ b/src/charts/chartpresenter_p.h @@ -41,6 +41,7 @@ #include <QtCharts/QChartGlobal> #include <QtCharts/QChart> //because of QChart::ChartThemeId +#include <QtCharts/private/qchartglobal_p.h> #include <private/glwidget_p.h> #include <QtCore/QRectF> #include <QtCore/QMargins> @@ -62,7 +63,7 @@ class ChartTitle; class ChartAnimation; class AbstractChartLayout; -class ChartPresenter: public QObject +class QT_CHARTS_PRIVATE_EXPORT ChartPresenter: public QObject { Q_OBJECT public: diff --git a/src/charts/charts.pro b/src/charts/charts.pro index bf262180..a412ba53 100644 --- a/src/charts/charts.pro +++ b/src/charts/charts.pro @@ -41,7 +41,8 @@ PRIVATE_HEADERS += \ $$PWD/scroller_p.h \ $$PWD/qabstractseries_p.h \ $$PWD/charttitle_p.h \ - $$PWD/charthelpers_p.h + $$PWD/charthelpers_p.h \ + $$PWD/qchartglobal_p.h contains(QT_CONFIG, opengl): PRIVATE_HEADERS += $$PWD/glwidget_p.h diff --git a/src/charts/chartthememanager_p.h b/src/charts/chartthememanager_p.h index 0a7d2f81..63a70663 100644 --- a/src/charts/chartthememanager_p.h +++ b/src/charts/chartthememanager_p.h @@ -43,11 +43,12 @@ #include <QtCharts/QChart> #include <QtGui/QColor> #include <QtGui/QGradientStops> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class ChartTheme; -class ChartThemeManager: public QObject +class QT_CHARTS_PRIVATE_EXPORT ChartThemeManager: public QObject { Q_OBJECT public: diff --git a/src/charts/charttitle_p.h b/src/charts/charttitle_p.h index 784df23b..aaed6e9c 100644 --- a/src/charts/charttitle_p.h +++ b/src/charts/charttitle_p.h @@ -41,10 +41,11 @@ #include <QtCharts/QChartGlobal> #include <QtWidgets/QGraphicsTextItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartTitle : public QGraphicsTextItem +class QT_CHARTS_PRIVATE_EXPORT ChartTitle : public QGraphicsTextItem { public: ChartTitle(QGraphicsItem *parent = 0); diff --git a/src/charts/domain/abstractdomain_p.h b/src/charts/domain/abstractdomain_p.h index b6f5d7dd..9a5c8022 100644 --- a/src/charts/domain/abstractdomain_p.h +++ b/src/charts/domain/abstractdomain_p.h @@ -39,6 +39,7 @@ #ifndef ABSTRACTDOMAIN_H #define ABSTRACTDOMAIN_H #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> #include <QtCore/QDebug> @@ -47,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QAbstractAxis; -class Q_AUTOTEST_EXPORT AbstractDomain: public QObject +class QT_CHARTS_PRIVATE_EXPORT AbstractDomain: public QObject { Q_OBJECT public: diff --git a/src/charts/domain/logxlogydomain_p.h b/src/charts/domain/logxlogydomain_p.h index b91c99b4..e30dd8d4 100644 --- a/src/charts/domain/logxlogydomain_p.h +++ b/src/charts/domain/logxlogydomain_p.h @@ -39,12 +39,13 @@ #ifndef LOGXLOGYDOMAIN_H #define LOGXLOGYDOMAIN_H #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT LogXLogYDomain: public AbstractDomain +class QT_CHARTS_PRIVATE_EXPORT LogXLogYDomain: public AbstractDomain { Q_OBJECT public: diff --git a/src/charts/domain/logxlogypolardomain_p.h b/src/charts/domain/logxlogypolardomain_p.h index 64c16d43..f25e6e03 100644 --- a/src/charts/domain/logxlogypolardomain_p.h +++ b/src/charts/domain/logxlogypolardomain_p.h @@ -39,12 +39,13 @@ #ifndef LOGXLOGYPOLARDOMAIN_H #define LOGXLOGYPOLARDOMAIN_H #include <private/polardomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT LogXLogYPolarDomain: public PolarDomain +class QT_CHARTS_PRIVATE_EXPORT LogXLogYPolarDomain: public PolarDomain { Q_OBJECT public: diff --git a/src/charts/domain/logxydomain_p.h b/src/charts/domain/logxydomain_p.h index d8559147..858a6d2e 100644 --- a/src/charts/domain/logxydomain_p.h +++ b/src/charts/domain/logxydomain_p.h @@ -39,12 +39,13 @@ #ifndef LOGXYDOMAIN_H #define LOGXYDOMAIN_H #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT LogXYDomain: public AbstractDomain +class QT_CHARTS_PRIVATE_EXPORT LogXYDomain: public AbstractDomain { Q_OBJECT public: diff --git a/src/charts/domain/logxypolardomain_p.h b/src/charts/domain/logxypolardomain_p.h index fdf42b14..6057be1c 100644 --- a/src/charts/domain/logxypolardomain_p.h +++ b/src/charts/domain/logxypolardomain_p.h @@ -39,12 +39,13 @@ #ifndef LOGXYPOLARDOMAIN_H #define LOGXYPOLARDOMAIN_H #include <private/polardomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT LogXYPolarDomain: public PolarDomain +class QT_CHARTS_PRIVATE_EXPORT LogXYPolarDomain: public PolarDomain { Q_OBJECT public: diff --git a/src/charts/domain/polardomain_p.h b/src/charts/domain/polardomain_p.h index bcb4b6e1..14dc4236 100644 --- a/src/charts/domain/polardomain_p.h +++ b/src/charts/domain/polardomain_p.h @@ -39,12 +39,13 @@ #ifndef POLARDOMAIN_H #define POLARDOMAIN_H #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT PolarDomain: public AbstractDomain +class QT_CHARTS_PRIVATE_EXPORT PolarDomain: public AbstractDomain { Q_OBJECT public: diff --git a/src/charts/domain/xlogydomain_p.h b/src/charts/domain/xlogydomain_p.h index f0f7bed3..f564f950 100644 --- a/src/charts/domain/xlogydomain_p.h +++ b/src/charts/domain/xlogydomain_p.h @@ -39,12 +39,13 @@ #ifndef XLOGYDOMAIN_H #define XLOGYDOMAIN_H #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT XLogYDomain: public AbstractDomain +class QT_CHARTS_PRIVATE_EXPORT XLogYDomain: public AbstractDomain { Q_OBJECT public: diff --git a/src/charts/domain/xlogypolardomain_p.h b/src/charts/domain/xlogypolardomain_p.h index dfc3405e..e11d691e 100644 --- a/src/charts/domain/xlogypolardomain_p.h +++ b/src/charts/domain/xlogypolardomain_p.h @@ -39,12 +39,13 @@ #ifndef XLOGYPOLARDOMAIN_H #define XLOGYPOLARDOMAIN_H #include <private/polardomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT XLogYPolarDomain: public PolarDomain +class QT_CHARTS_PRIVATE_EXPORT XLogYPolarDomain: public PolarDomain { Q_OBJECT public: diff --git a/src/charts/domain/xydomain_p.h b/src/charts/domain/xydomain_p.h index c4d51a91..97c89989 100644 --- a/src/charts/domain/xydomain_p.h +++ b/src/charts/domain/xydomain_p.h @@ -39,12 +39,13 @@ #ifndef XYDOMAIN_H #define XYDOMAIN_H #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT XYDomain: public AbstractDomain +class QT_CHARTS_PRIVATE_EXPORT XYDomain: public AbstractDomain { Q_OBJECT public: diff --git a/src/charts/domain/xypolardomain_p.h b/src/charts/domain/xypolardomain_p.h index a7bc55c3..9d027661 100644 --- a/src/charts/domain/xypolardomain_p.h +++ b/src/charts/domain/xypolardomain_p.h @@ -39,11 +39,12 @@ #ifndef XYPOLARDOMAIN_H #define XYPOLARDOMAIN_H #include <private/polardomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT XYPolarDomain: public PolarDomain +class QT_CHARTS_PRIVATE_EXPORT XYPolarDomain: public PolarDomain { Q_OBJECT public: diff --git a/src/charts/layout/abstractchartlayout_p.h b/src/charts/layout/abstractchartlayout_p.h index f2ef7861..6cb07f97 100644 --- a/src/charts/layout/abstractchartlayout_p.h +++ b/src/charts/layout/abstractchartlayout_p.h @@ -42,6 +42,7 @@ #include <QtWidgets/QGraphicsLayout> #include <QtCore/QMargins> #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -51,7 +52,7 @@ class ChartPresenter; class QLegend; class ChartBackground; -class AbstractChartLayout : public QGraphicsLayout +class QT_CHARTS_PRIVATE_EXPORT AbstractChartLayout : public QGraphicsLayout { public: AbstractChartLayout(ChartPresenter *presenter); diff --git a/src/charts/layout/cartesianchartlayout_p.h b/src/charts/layout/cartesianchartlayout_p.h index 10b4b988..d225e2af 100644 --- a/src/charts/layout/cartesianchartlayout_p.h +++ b/src/charts/layout/cartesianchartlayout_p.h @@ -40,10 +40,11 @@ #define CARTESIANCHARTLAYOUT_H #include <private/abstractchartlayout_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class CartesianChartLayout : public AbstractChartLayout +class QT_CHARTS_PRIVATE_EXPORT CartesianChartLayout : public AbstractChartLayout { public: CartesianChartLayout(ChartPresenter *presenter); diff --git a/src/charts/layout/polarchartlayout_p.h b/src/charts/layout/polarchartlayout_p.h index 077b0935..597c4a3c 100644 --- a/src/charts/layout/polarchartlayout_p.h +++ b/src/charts/layout/polarchartlayout_p.h @@ -40,10 +40,11 @@ #define POLARCHARTLAYOUT_H #include <private/abstractchartlayout_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class PolarChartLayout : public AbstractChartLayout +class QT_CHARTS_PRIVATE_EXPORT PolarChartLayout : public AbstractChartLayout { public: PolarChartLayout(ChartPresenter *presenter); diff --git a/src/charts/legend/legendlayout_p.h b/src/charts/legend/legendlayout_p.h index a9165973..7933c245 100644 --- a/src/charts/legend/legendlayout_p.h +++ b/src/charts/legend/legendlayout_p.h @@ -40,13 +40,14 @@ #define LEGENDLAYOUT_H #include <QtWidgets/QGraphicsLayout> #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QLegend; class LegendMarkerItem; -class LegendLayout : public QGraphicsLayout +class QT_CHARTS_PRIVATE_EXPORT LegendLayout : public QGraphicsLayout { public: diff --git a/src/charts/legend/legendmarkeritem_p.h b/src/charts/legend/legendmarkeritem_p.h index 5325f8d1..d3d71de3 100644 --- a/src/charts/legend/legendmarkeritem_p.h +++ b/src/charts/legend/legendmarkeritem_p.h @@ -47,12 +47,13 @@ #include <QtGui/QPen> #include <QtWidgets/QGraphicsTextItem> #include <QtWidgets/QGraphicsLayoutItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QLegendMarkerPrivate; -class LegendMarkerItem : public QGraphicsObject, public QGraphicsLayoutItem +class QT_CHARTS_PRIVATE_EXPORT LegendMarkerItem : public QGraphicsObject, public QGraphicsLayoutItem { Q_OBJECT Q_INTERFACES(QGraphicsLayoutItem) diff --git a/src/charts/legend/legendscroller_p.h b/src/charts/legend/legendscroller_p.h index 89cee4c1..fc57a9d3 100644 --- a/src/charts/legend/legendscroller_p.h +++ b/src/charts/legend/legendscroller_p.h @@ -43,10 +43,11 @@ #include <QtCharts/qlegend.h> #include <private/qlegend_p.h> #include <private/scroller_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class LegendScroller: public QLegend, public Scroller +class QT_CHARTS_PRIVATE_EXPORT LegendScroller: public QLegend, public Scroller { Q_OBJECT diff --git a/src/charts/legend/qarealegendmarker_p.h b/src/charts/legend/qarealegendmarker_p.h index 3afa3321..f44f8e74 100644 --- a/src/charts/legend/qarealegendmarker_p.h +++ b/src/charts/legend/qarealegendmarker_p.h @@ -43,12 +43,13 @@ #include <private/qlegendmarker_p.h> #include <private/legendmarkeritem_p.h> #include <QtCharts/QAreaSeries> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QAreaLegendMarker; -class QAreaLegendMarkerPrivate : public QLegendMarkerPrivate +class QT_CHARTS_PRIVATE_EXPORT QAreaLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/legend/qbarlegendmarker_p.h b/src/charts/legend/qbarlegendmarker_p.h index 58404111..7bfabd69 100644 --- a/src/charts/legend/qbarlegendmarker_p.h +++ b/src/charts/legend/qbarlegendmarker_p.h @@ -44,12 +44,13 @@ #include <private/legendmarkeritem_p.h> #include <QtCharts/QAbstractBarSeries> #include <QtCharts/QBarSet> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QBarLegendMarker; -class QBarLegendMarkerPrivate : public QLegendMarkerPrivate +class QT_CHARTS_PRIVATE_EXPORT QBarLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/legend/qboxplotlegendmarker_p.h b/src/charts/legend/qboxplotlegendmarker_p.h index 1c788137..5d82965f 100644 --- a/src/charts/legend/qboxplotlegendmarker_p.h +++ b/src/charts/legend/qboxplotlegendmarker_p.h @@ -43,12 +43,13 @@ #include <private/qlegendmarker_p.h> #include <private/legendmarkeritem_p.h> #include <QtCharts/QBoxPlotSeries> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QBoxPlotLegendMarker; -class QBoxPlotLegendMarkerPrivate : public QLegendMarkerPrivate +class QT_CHARTS_PRIVATE_EXPORT QBoxPlotLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/legend/qcandlesticklegendmarker_p.h b/src/charts/legend/qcandlesticklegendmarker_p.h index 1c786b3a..b92ea626 100644 --- a/src/charts/legend/qcandlesticklegendmarker_p.h +++ b/src/charts/legend/qcandlesticklegendmarker_p.h @@ -40,13 +40,14 @@ #define QCANDLESTICKLEGENDMARKER_P_H #include <private/qlegendmarker_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QCandlestickLegendMarker; class QCandlestickSeries; -class QCandlestickLegendMarkerPrivate : public QLegendMarkerPrivate +class QT_CHARTS_PRIVATE_EXPORT QCandlestickLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/legend/qlegend_p.h b/src/charts/legend/qlegend_p.h index 83dd0c0b..0f69004c 100644 --- a/src/charts/legend/qlegend_p.h +++ b/src/charts/legend/qlegend_p.h @@ -40,6 +40,7 @@ #define QLEGEND_P_H #include <QtCharts/QLegend> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -49,7 +50,7 @@ class QAbstractSeries; class LegendLayout; class QLegendMarker; -class QLegendPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QLegendPrivate : public QObject { Q_OBJECT public: diff --git a/src/charts/legend/qlegendmarker_p.h b/src/charts/legend/qlegendmarker_p.h index 00d24542..cd2ebea3 100644 --- a/src/charts/legend/qlegendmarker_p.h +++ b/src/charts/legend/qlegendmarker_p.h @@ -44,6 +44,7 @@ #include <QtGui/QBrush> #include <QtGui/QPen> #include <QtWidgets/QGraphicsLayoutItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -53,7 +54,7 @@ class QLegend; class QLegendMarker; class LegendMarkerItem; -class QLegendMarkerPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QLegendMarkerPrivate : public QObject { Q_OBJECT public: diff --git a/src/charts/legend/qpielegendmarker_p.h b/src/charts/legend/qpielegendmarker_p.h index 6aeb4ac9..72bdd7ec 100644 --- a/src/charts/legend/qpielegendmarker_p.h +++ b/src/charts/legend/qpielegendmarker_p.h @@ -44,12 +44,13 @@ #include <private/legendmarkeritem_p.h> #include <QtCharts/QPieSeries> #include <QtCharts/QPieSlice> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QPieLegendMarker; -class QPieLegendMarkerPrivate : public QLegendMarkerPrivate +class QT_CHARTS_PRIVATE_EXPORT QPieLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/legend/qxylegendmarker_p.h b/src/charts/legend/qxylegendmarker_p.h index 7322c116..995a3226 100644 --- a/src/charts/legend/qxylegendmarker_p.h +++ b/src/charts/legend/qxylegendmarker_p.h @@ -43,12 +43,13 @@ #include <private/qlegendmarker_p.h> #include <private/legendmarkeritem_p.h> #include <QtCharts/QXYSeries> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QXYLegendMarker; -class QXYLegendMarkerPrivate : public QLegendMarkerPrivate +class QT_CHARTS_PRIVATE_EXPORT QXYLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/linechart/linechartitem_p.h b/src/charts/linechart/linechartitem_p.h index d4b64122..fd335168 100644 --- a/src/charts/linechart/linechartitem_p.h +++ b/src/charts/linechart/linechartitem_p.h @@ -43,13 +43,14 @@ #include <private/xychart_p.h> #include <QtCharts/QChart> #include <QtGui/QPen> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QLineSeries; class ChartPresenter; -class LineChartItem : public XYChart +class QT_CHARTS_PRIVATE_EXPORT LineChartItem : public XYChart { Q_OBJECT Q_INTERFACES(QGraphicsItem) diff --git a/src/charts/linechart/qlineseries_p.h b/src/charts/linechart/qlineseries_p.h index 8276ae3f..a59d39c7 100644 --- a/src/charts/linechart/qlineseries_p.h +++ b/src/charts/linechart/qlineseries_p.h @@ -40,11 +40,12 @@ #define QLINESERIES_P_H #include <private/qxyseries_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QLineSeriesPrivate: public QXYSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QLineSeriesPrivate: public QXYSeriesPrivate { public: QLineSeriesPrivate(QLineSeries *q); diff --git a/src/charts/piechart/piechartitem_p.h b/src/charts/piechart/piechartitem_p.h index 9c178271..53276313 100644 --- a/src/charts/piechart/piechartitem_p.h +++ b/src/charts/piechart/piechartitem_p.h @@ -43,6 +43,7 @@ #include <private/chartitem_p.h> #include <private/piesliceitem_p.h> #include <QtCore/QPointer> +#include <QtCharts/private/qchartglobal_p.h> QT_BEGIN_NAMESPACE class QGraphicsItem; @@ -53,7 +54,7 @@ class QPieSlice; class ChartPresenter; class PieAnimation; -class PieChartItem : public ChartItem +class QT_CHARTS_PRIVATE_EXPORT PieChartItem : public ChartItem { Q_OBJECT diff --git a/src/charts/piechart/piesliceitem_p.h b/src/charts/piechart/piesliceitem_p.h index f24ddfb4..832ae431 100644 --- a/src/charts/piechart/piesliceitem_p.h +++ b/src/charts/piechart/piesliceitem_p.h @@ -43,6 +43,7 @@ #include <private/charttheme_p.h> #include <QtCharts/QPieSeries> #include <private/pieslicedata_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtWidgets/QGraphicsItem> #include <QtCore/QRectF> #include <QtGui/QColor> @@ -55,7 +56,7 @@ class PieChartItem; class PieSliceLabel; class QPieSlice; -class PieSliceItem : public QGraphicsObject +class QT_CHARTS_PRIVATE_EXPORT PieSliceItem : public QGraphicsObject { Q_OBJECT diff --git a/src/charts/piechart/qpiemodelmapper_p.h b/src/charts/piechart/qpiemodelmapper_p.h index db1a3da4..a590f4b6 100644 --- a/src/charts/piechart/qpiemodelmapper_p.h +++ b/src/charts/piechart/qpiemodelmapper_p.h @@ -41,6 +41,7 @@ #include <QtCore/QObject> #include <QtCharts/QPieModelMapper> +#include <QtCharts/private/qchartglobal_p.h> QT_BEGIN_NAMESPACE class QModelIndex; @@ -50,7 +51,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QPieSlice; -class QPieModelMapperPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QPieModelMapperPrivate : public QObject { Q_OBJECT diff --git a/src/charts/piechart/qpieseries_p.h b/src/charts/piechart/qpieseries_p.h index 72392541..887d8531 100644 --- a/src/charts/piechart/qpieseries_p.h +++ b/src/charts/piechart/qpieseries_p.h @@ -41,11 +41,12 @@ #include <QtCharts/QPieSeries> #include <private/qabstractseries_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QLegendPrivate; -class QPieSeriesPrivate : public QAbstractSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QPieSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT diff --git a/src/charts/piechart/qpieslice_p.h b/src/charts/piechart/qpieslice_p.h index 3f343290..bb64b3d2 100644 --- a/src/charts/piechart/qpieslice_p.h +++ b/src/charts/piechart/qpieslice_p.h @@ -42,11 +42,12 @@ #include <QtCore/QObject> #include <QtCharts/QPieSlice> #include <private/pieslicedata_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QPieSeries; -class QPieSlicePrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QPieSlicePrivate : public QObject { Q_OBJECT diff --git a/src/charts/qabstractseries_p.h b/src/charts/qabstractseries_p.h index 0d50ea2b..1941b92f 100644 --- a/src/charts/qabstractseries_p.h +++ b/src/charts/qabstractseries_p.h @@ -42,6 +42,7 @@ #include <QtCharts/QAbstractSeries> #include <QtCharts/QChart> #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_BEGIN_NAMESPACE class QGraphicsItem; @@ -61,7 +62,7 @@ class ChartAnimation; class ChartItem; class BoxPlotChartItem; -class QAbstractSeriesPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QAbstractSeriesPrivate : public QObject { Q_OBJECT public: diff --git a/src/charts/qchart_p.h b/src/charts/qchart_p.h index 1f11b3ca..7ed518b8 100644 --- a/src/charts/qchart_p.h +++ b/src/charts/qchart_p.h @@ -41,6 +41,7 @@ #include <QtCharts/QChartGlobal> #include <QtCharts/QChart> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -49,7 +50,7 @@ class ChartPresenter; class QLegend; class ChartDataSet; -class QChartPrivate +class QT_CHARTS_PRIVATE_EXPORT QChartPrivate { public: diff --git a/src/charts/qchartglobal_p.h b/src/charts/qchartglobal_p.h new file mode 100644 index 00000000..59bf62f8 --- /dev/null +++ b/src/charts/qchartglobal_p.h @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QCHARTGLOBAL_P_H +#define QCHARTGLOBAL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qchartglobal.h" + +#define QT_CHARTS_PRIVATE_EXPORT QT_CHARTS_EXPORT + +#endif // QCHARTGLOBAL_P_H diff --git a/src/charts/qchartview_p.h b/src/charts/qchartview_p.h index a71366cf..01c66908 100644 --- a/src/charts/qchartview_p.h +++ b/src/charts/qchartview_p.h @@ -40,6 +40,7 @@ #define QCHARTVIEW_P_H #include <QtCharts/QChartView> +#include <QtCharts/private/qchartglobal_p.h> QT_BEGIN_NAMESPACE class QGraphicsScene; @@ -51,7 +52,7 @@ class QChart; class ChartPresenter; class QChartView; -class QChartViewPrivate +class QT_CHARTS_PRIVATE_EXPORT QChartViewPrivate { public: explicit QChartViewPrivate(QChartView *q, QChart *chart = 0); diff --git a/src/charts/scatterchart/qscatterseries_p.h b/src/charts/scatterchart/qscatterseries_p.h index 6a90c0f1..7d9c723f 100644 --- a/src/charts/scatterchart/qscatterseries_p.h +++ b/src/charts/scatterchart/qscatterseries_p.h @@ -40,10 +40,11 @@ #define QSCATTERSERIES_P_H #include <private/qxyseries_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QScatterSeriesPrivate: public QXYSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QScatterSeriesPrivate: public QXYSeriesPrivate { public: QScatterSeriesPrivate(QScatterSeries *q); diff --git a/src/charts/scatterchart/scatterchartitem_p.h b/src/charts/scatterchart/scatterchartitem_p.h index dffbf391..5bf52af0 100644 --- a/src/charts/scatterchart/scatterchartitem_p.h +++ b/src/charts/scatterchart/scatterchartitem_p.h @@ -44,12 +44,13 @@ #include <QtWidgets/QGraphicsEllipseItem> #include <QtGui/QPen> #include <QtWidgets/QGraphicsSceneMouseEvent> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QScatterSeries; -class ScatterChartItem : public XYChart +class QT_CHARTS_PRIVATE_EXPORT ScatterChartItem : public XYChart { Q_OBJECT Q_INTERFACES(QGraphicsItem) @@ -102,7 +103,7 @@ private: bool m_mousePressed; }; -class CircleMarker: public QGraphicsEllipseItem +class QT_CHARTS_PRIVATE_EXPORT CircleMarker: public QGraphicsEllipseItem { public: @@ -149,7 +150,7 @@ private: ScatterChartItem *m_parent; }; -class RectangleMarker: public QGraphicsRectItem +class QT_CHARTS_PRIVATE_EXPORT RectangleMarker: public QGraphicsRectItem { public: diff --git a/src/charts/scroller_p.h b/src/charts/scroller_p.h index c6704334..3412a7ff 100644 --- a/src/charts/scroller_p.h +++ b/src/charts/scroller_p.h @@ -44,6 +44,7 @@ #include <QtCore/QBasicTimer> #include <QtCore/QTime> #include <QtCore/QPointF> +#include <QtCharts/private/qchartglobal_p.h> QT_BEGIN_NAMESPACE class QGraphicsSceneMouseEvent; @@ -54,7 +55,7 @@ QT_CHARTS_BEGIN_NAMESPACE class Scroller; class QLegend; -class ScrollTicker : public QObject +class QT_CHARTS_PRIVATE_EXPORT ScrollTicker : public QObject { Q_OBJECT public: @@ -69,7 +70,7 @@ private: Scroller *m_scroller; }; -class Scroller +class QT_CHARTS_PRIVATE_EXPORT Scroller { public: enum State { diff --git a/src/charts/splinechart/qsplineseries_p.h b/src/charts/splinechart/qsplineseries_p.h index e2b5fd85..dd3fc222 100644 --- a/src/charts/splinechart/qsplineseries_p.h +++ b/src/charts/splinechart/qsplineseries_p.h @@ -40,11 +40,12 @@ #define QSPLINESERIES_P_H #include <private/qlineseries_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QSplineSeriesPrivate: public QLineSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QSplineSeriesPrivate: public QLineSeriesPrivate { Q_OBJECT public: diff --git a/src/charts/splinechart/splinechartitem_p.h b/src/charts/splinechart/splinechartitem_p.h index 66aa9032..bc5f5661 100644 --- a/src/charts/splinechart/splinechartitem_p.h +++ b/src/charts/splinechart/splinechartitem_p.h @@ -41,12 +41,13 @@ #include <QtCharts/QSplineSeries> #include <private/xychart_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class SplineAnimation; -class SplineChartItem : public XYChart +class QT_CHARTS_PRIVATE_EXPORT SplineChartItem : public XYChart { Q_OBJECT Q_INTERFACES(QGraphicsItem) diff --git a/src/charts/themes/charttheme_p.h b/src/charts/themes/charttheme_p.h index 4ef18e69..bb128134 100644 --- a/src/charts/themes/charttheme_p.h +++ b/src/charts/themes/charttheme_p.h @@ -42,10 +42,11 @@ #include <private/chartthememanager_p.h> #include <QtGui/QColor> #include <QtGui/QGradientStops> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartTheme { public: diff --git a/src/charts/themes/chartthemebluecerulean_p.h b/src/charts/themes/chartthemebluecerulean_p.h index 5bae2adb..6bdcc10b 100644 --- a/src/charts/themes/chartthemebluecerulean_p.h +++ b/src/charts/themes/chartthemebluecerulean_p.h @@ -40,10 +40,11 @@ #define CHARTTHEMEBLUECERULEAN_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeBlueCerulean: public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeBlueCerulean: public ChartTheme { public: ChartThemeBlueCerulean() : ChartTheme(QChart::ChartThemeBlueCerulean) { diff --git a/src/charts/themes/chartthemeblueicy_p.h b/src/charts/themes/chartthemeblueicy_p.h index d846a95b..808c16e5 100644 --- a/src/charts/themes/chartthemeblueicy_p.h +++ b/src/charts/themes/chartthemeblueicy_p.h @@ -40,10 +40,11 @@ #define CHARTTHEMEBLUEICY_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeBlueIcy: public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeBlueIcy: public ChartTheme { public: ChartThemeBlueIcy() : ChartTheme(QChart::ChartThemeBlueIcy) diff --git a/src/charts/themes/chartthemebluencs_p.h b/src/charts/themes/chartthemebluencs_p.h index 06496d09..94234224 100644 --- a/src/charts/themes/chartthemebluencs_p.h +++ b/src/charts/themes/chartthemebluencs_p.h @@ -40,10 +40,11 @@ #define CHARTTHEMEBLUENCS_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeBlueNcs: public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeBlueNcs: public ChartTheme { public: ChartThemeBlueNcs() : ChartTheme(QChart::ChartThemeBlueNcs) diff --git a/src/charts/themes/chartthemebrownsand_p.h b/src/charts/themes/chartthemebrownsand_p.h index 40d79d9f..5e48fd80 100644 --- a/src/charts/themes/chartthemebrownsand_p.h +++ b/src/charts/themes/chartthemebrownsand_p.h @@ -40,10 +40,11 @@ #define CHARTTHEMEBROWNSAND_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeBrownSand: public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeBrownSand: public ChartTheme { public: ChartThemeBrownSand() : ChartTheme(QChart::ChartThemeBrownSand) diff --git a/src/charts/themes/chartthemedark_p.h b/src/charts/themes/chartthemedark_p.h index 8790a154..a8f9f477 100644 --- a/src/charts/themes/chartthemedark_p.h +++ b/src/charts/themes/chartthemedark_p.h @@ -40,10 +40,11 @@ #define CHARTTHEMEDARK_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeDark : public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeDark : public ChartTheme { public: ChartThemeDark() : ChartTheme(QChart::ChartThemeDark) diff --git a/src/charts/themes/chartthemehighcontrast_p.h b/src/charts/themes/chartthemehighcontrast_p.h index 77b48b3d..b1cd8446 100644 --- a/src/charts/themes/chartthemehighcontrast_p.h +++ b/src/charts/themes/chartthemehighcontrast_p.h @@ -40,10 +40,11 @@ #define CHARTTHEMEHIGHCONTRAST_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeHighContrast : public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeHighContrast : public ChartTheme { public: ChartThemeHighContrast() : ChartTheme(QChart::ChartThemeHighContrast) diff --git a/src/charts/themes/chartthemelight_p.h b/src/charts/themes/chartthemelight_p.h index 1121629b..e7ed47c0 100644 --- a/src/charts/themes/chartthemelight_p.h +++ b/src/charts/themes/chartthemelight_p.h @@ -40,10 +40,11 @@ #define CHARTTHEMELIGHT_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeLight: public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeLight: public ChartTheme { public: ChartThemeLight() : ChartTheme(QChart::ChartThemeLight) diff --git a/src/charts/themes/chartthemeqt_p.h b/src/charts/themes/chartthemeqt_p.h index 4634bb71..af335a89 100644 --- a/src/charts/themes/chartthemeqt_p.h +++ b/src/charts/themes/chartthemeqt_p.h @@ -40,10 +40,11 @@ #define CHARTTHEMEQT_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeQt : public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeQt : public ChartTheme { public: ChartThemeQt() : ChartTheme(QChart::ChartThemeQt) diff --git a/src/charts/themes/chartthemesystem_p.h b/src/charts/themes/chartthemesystem_p.h index 01cce56a..a79ac201 100644 --- a/src/charts/themes/chartthemesystem_p.h +++ b/src/charts/themes/chartthemesystem_p.h @@ -40,6 +40,7 @@ #define CHARTTHEMESYSTEM_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> #ifdef Q_OS_WIN #include <windows.h> #include <stdio.h> @@ -47,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeSystem: public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeSystem: public ChartTheme { public: // System theme not used at the moment (the user is not able to select this theme) 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: |