Switch export macros to standard formv5.13.0-beta2

Qt expects the export macros to have Q_ prefixes, otherwise the symbol
versioning script won't find them and mark them.

Task-number: QTBUG-73752
Change-Id: I4ee654eadbbfc6f5c25f3bb0a8123c8c17235c12
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

29 files changed, 29 insertions, 29 deletions

diff --git a/src/charts/barchart/abstractbarchartitem_p.h b/src/charts/barchart/abstractbarchartitem_p.h
index 7afd8ec8..92e2304a 100644
--- a/src/charts/barchart/abstractbarchartitem_p.h
+++ b/src/charts/barchart/abstractbarchartitem_p.h
@@ -55,7 +55,7 @@ class BarAnimation;
 class QBarSetPrivate;
 class QAbstractAxis;
 
-class QT_CHARTS_PRIVATE_EXPORT AbstractBarChartItem : public ChartItem
+class Q_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 654d88a3..d29ce5a9 100644
--- a/src/charts/barchart/bar_p.h
+++ b/src/charts/barchart/bar_p.h
@@ -49,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 class QBarSet;
 
 // Single visual bar item of chart
-class QT_CHARTS_PRIVATE_EXPORT Bar : public QObject, public QGraphicsRectItem
+class Q_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 d9d5c515..64154e8e 100644
--- a/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h
+++ b/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h
@@ -45,7 +45,7 @@
 
 QT_CHARTS_BEGIN_NAMESPACE
 
-class QT_CHARTS_PRIVATE_EXPORT HorizontalBarChartItem : public AbstractBarChartItem
+class Q_CHARTS_PRIVATE_EXPORT HorizontalBarChartItem : public AbstractBarChartItem
 {
     Q_OBJECT
 public:
diff --git a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h
index c3d07e0d..bf5ed30f 100644
--- a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h
+++ b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h
@@ -36,7 +36,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 
 class QHorizontalBarSeriesPrivate;
 
-class QT_CHARTS_EXPORT QHorizontalBarSeries : public QAbstractBarSeries
+class Q_CHARTS_EXPORT QHorizontalBarSeries : public QAbstractBarSeries
 {
     Q_OBJECT
 public:
diff --git a/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h b/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h
index 650bad5f..d66ade48 100644
--- a/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h
+++ b/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h
@@ -45,7 +45,7 @@
 
 QT_CHARTS_BEGIN_NAMESPACE
 
-class QT_CHARTS_PRIVATE_EXPORT QHorizontalBarSeriesPrivate: public QAbstractBarSeriesPrivate
+class Q_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 bff54e9b..ac2eb4aa 100644
--- a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h
+++ b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h
@@ -45,7 +45,7 @@
 
 QT_CHARTS_BEGIN_NAMESPACE
 
-class QT_CHARTS_PRIVATE_EXPORT HorizontalPercentBarChartItem : public AbstractBarChartItem
+class Q_CHARTS_PRIVATE_EXPORT HorizontalPercentBarChartItem : public AbstractBarChartItem
 {
     Q_OBJECT
 public:
diff --git a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h
index 5c78b029..49b3ad2b 100644
--- a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h
+++ b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h
@@ -36,7 +36,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 
 class QHorizontalPercentBarSeriesPrivate;
 
-class QT_CHARTS_EXPORT QHorizontalPercentBarSeries : public QAbstractBarSeries
+class Q_CHARTS_EXPORT QHorizontalPercentBarSeries : public QAbstractBarSeries
 {
     Q_OBJECT
 public:
diff --git a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h
index e17381ff..24c0bf67 100644
--- a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h
+++ b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h
@@ -45,7 +45,7 @@
 
 QT_CHARTS_BEGIN_NAMESPACE
 
-class QT_CHARTS_PRIVATE_EXPORT QHorizontalPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate
+class Q_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 d3744490..a05c1107 100644
--- a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h
+++ b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h
@@ -45,7 +45,7 @@
 
 QT_CHARTS_BEGIN_NAMESPACE
 
-class QT_CHARTS_PRIVATE_EXPORT HorizontalStackedBarChartItem : public AbstractBarChartItem
+class Q_CHARTS_PRIVATE_EXPORT HorizontalStackedBarChartItem : public AbstractBarChartItem
 {
     Q_OBJECT
 public:
diff --git a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h
index 9f944262..dff60ff5 100644
--- a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h
+++ b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h
@@ -36,7 +36,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 
 class QHorizontalStackedBarSeriesPrivate;
 
-class QT_CHARTS_EXPORT QHorizontalStackedBarSeries : public QAbstractBarSeries
+class Q_CHARTS_EXPORT QHorizontalStackedBarSeries : public QAbstractBarSeries
 {
     Q_OBJECT
 public:
diff --git a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h
index 1c3e014e..a5810336 100644
--- a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h
+++ b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h
@@ -45,7 +45,7 @@
 
 QT_CHARTS_BEGIN_NAMESPACE
 
-class QT_CHARTS_PRIVATE_EXPORT QHorizontalStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate
+class Q_CHARTS_PRIVATE_EXPORT QHorizontalStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate
 {
 public:
     QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries *q);
diff --git a/src/charts/barchart/qabstractbarseries.h b/src/charts/barchart/qabstractbarseries.h
index 82000d34..e3f4ac97 100644
--- a/src/charts/barchart/qabstractbarseries.h
+++ b/src/charts/barchart/qabstractbarseries.h
@@ -39,7 +39,7 @@ class QBarSet;
 class QAbstractBarSeriesPrivate;
 
 // Container for series
-class QT_CHARTS_EXPORT QAbstractBarSeries : public QAbstractSeries
+class Q_CHARTS_EXPORT QAbstractBarSeries : public QAbstractSeries
 {
     Q_OBJECT
     Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth)
diff --git a/src/charts/barchart/qabstractbarseries_p.h b/src/charts/barchart/qabstractbarseries_p.h
index 99fadeeb..a2902fb6 100644
--- a/src/charts/barchart/qabstractbarseries_p.h
+++ b/src/charts/barchart/qabstractbarseries_p.h
@@ -51,7 +51,7 @@ class QBarModelMapper;
 class QBarCategoryAxis;
 class QLegendMarker;
 
-class QT_CHARTS_PRIVATE_EXPORT QAbstractBarSeriesPrivate : public QAbstractSeriesPrivate
+class Q_CHARTS_PRIVATE_EXPORT QAbstractBarSeriesPrivate : public QAbstractSeriesPrivate
 {
     Q_OBJECT
 public:
diff --git a/src/charts/barchart/qbarmodelmapper.cpp b/src/charts/barchart/qbarmodelmapper.cpp
index bf3391c6..39195e69 100644
--- a/src/charts/barchart/qbarmodelmapper.cpp
+++ b/src/charts/barchart/qbarmodelmapper.cpp
@@ -545,7 +545,7 @@ QBarSet *qt_allocate_bar_set_cpp(const QString &label)
     return new QBarSet(label);
 }
 
-QT_CHARTS_EXPORT QBarSet *(*qt_allocate_bar_set)(const QString &label) = &qt_allocate_bar_set_cpp;
+Q_CHARTS_EXPORT QBarSet *(*qt_allocate_bar_set)(const QString &label) = &qt_allocate_bar_set_cpp;
 
 void QBarModelMapperPrivate::initializeBarFromModel()
 {
diff --git a/src/charts/barchart/qbarmodelmapper.h b/src/charts/barchart/qbarmodelmapper.h
index 6d08fb5a..3aa77d92 100644
--- a/src/charts/barchart/qbarmodelmapper.h
+++ b/src/charts/barchart/qbarmodelmapper.h
@@ -42,7 +42,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 class QBarModelMapperPrivate;
 class QAbstractBarSeries;
 
-class QT_CHARTS_EXPORT QBarModelMapper : public QObject
+class Q_CHARTS_EXPORT QBarModelMapper : public QObject
 {
     Q_OBJECT
 
diff --git a/src/charts/barchart/qbarmodelmapper_p.h b/src/charts/barchart/qbarmodelmapper_p.h
index cf08d5aa..fec7c415 100644
--- a/src/charts/barchart/qbarmodelmapper_p.h
+++ b/src/charts/barchart/qbarmodelmapper_p.h
@@ -51,7 +51,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 
 class QBarSet;
 
-class QT_CHARTS_PRIVATE_EXPORT QBarModelMapperPrivate : public QObject
+class Q_CHARTS_PRIVATE_EXPORT QBarModelMapperPrivate : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/charts/barchart/qbarset.h b/src/charts/barchart/qbarset.h
index 7edd93e0..8efaaa07 100644
--- a/src/charts/barchart/qbarset.h
+++ b/src/charts/barchart/qbarset.h
@@ -38,7 +38,7 @@
 QT_CHARTS_BEGIN_NAMESPACE
 class QBarSetPrivate;
 
-class QT_CHARTS_EXPORT QBarSet : public QObject
+class Q_CHARTS_EXPORT QBarSet : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
diff --git a/src/charts/barchart/qbarset_p.h b/src/charts/barchart/qbarset_p.h
index 78876b7b..464908b7 100644
--- a/src/charts/barchart/qbarset_p.h
+++ b/src/charts/barchart/qbarset_p.h
@@ -48,7 +48,7 @@
 
 QT_CHARTS_BEGIN_NAMESPACE
 
-class QT_CHARTS_PRIVATE_EXPORT QBarSetPrivate : public QObject
+class Q_CHARTS_PRIVATE_EXPORT QBarSetPrivate : public QObject
 {
     Q_OBJECT
 
diff --git a/src/charts/barchart/qhbarmodelmapper.h b/src/charts/barchart/qhbarmodelmapper.h
index 7639ed6b..05abb3c7 100644
--- a/src/charts/barchart/qhbarmodelmapper.h
+++ b/src/charts/barchart/qhbarmodelmapper.h
@@ -34,7 +34,7 @@
 
 QT_CHARTS_BEGIN_NAMESPACE
 /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */
-class QT_CHARTS_EXPORT QHBarModelMapper : public QBarModelMapper
+class Q_CHARTS_EXPORT QHBarModelMapper : public QBarModelMapper
 {
     Q_OBJECT
     Q_PROPERTY(QtCharts::QAbstractBarSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
diff --git a/src/charts/barchart/qvbarmodelmapper.h b/src/charts/barchart/qvbarmodelmapper.h
index b859a76a..239b3baa 100644
--- a/src/charts/barchart/qvbarmodelmapper.h
+++ b/src/charts/barchart/qvbarmodelmapper.h
@@ -34,7 +34,7 @@
 
 QT_CHARTS_BEGIN_NAMESPACE
 /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */
-class QT_CHARTS_EXPORT QVBarModelMapper : public QBarModelMapper
+class Q_CHARTS_EXPORT QVBarModelMapper : public QBarModelMapper
 {
     Q_OBJECT
     Q_PROPERTY(QtCharts::QAbstractBarSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
diff --git a/src/charts/barchart/vertical/bar/barchartitem_p.h b/src/charts/barchart/vertical/bar/barchartitem_p.h
index 174eaa7a..f6e8b71f 100644
--- a/src/charts/barchart/vertical/bar/barchartitem_p.h
+++ b/src/charts/barchart/vertical/bar/barchartitem_p.h
@@ -47,7 +47,7 @@
 
 QT_CHARTS_BEGIN_NAMESPACE
 
-class QT_CHARTS_PRIVATE_EXPORT BarChartItem : public AbstractBarChartItem
+class Q_CHARTS_PRIVATE_EXPORT BarChartItem : public AbstractBarChartItem
 {
     Q_OBJECT
 public:
diff --git a/src/charts/barchart/vertical/bar/qbarseries.h b/src/charts/barchart/vertical/bar/qbarseries.h
index 5de28119..c6cde538 100644
--- a/src/charts/barchart/vertical/bar/qbarseries.h
+++ b/src/charts/barchart/vertical/bar/qbarseries.h
@@ -36,7 +36,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 
 class QBarSeriesPrivate;
 
-class QT_CHARTS_EXPORT QBarSeries : public QAbstractBarSeries
+class Q_CHARTS_EXPORT QBarSeries : public QAbstractBarSeries
 {
     Q_OBJECT
 public:
diff --git a/src/charts/barchart/vertical/bar/qbarseries_p.h b/src/charts/barchart/vertical/bar/qbarseries_p.h
index 270ac4bc..16b633cb 100644
--- a/src/charts/barchart/vertical/bar/qbarseries_p.h
+++ b/src/charts/barchart/vertical/bar/qbarseries_p.h
@@ -46,7 +46,7 @@
 QT_CHARTS_BEGIN_NAMESPACE
 
 
-class QT_CHARTS_PRIVATE_EXPORT QBarSeriesPrivate: public QAbstractBarSeriesPrivate
+class Q_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 a922f62d..344e23fb 100644
--- a/src/charts/barchart/vertical/percent/percentbarchartitem_p.h
+++ b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h
@@ -48,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 
 class QAbstractBarSeries;
 
-class QT_CHARTS_PRIVATE_EXPORT PercentBarChartItem : public AbstractBarChartItem
+class Q_CHARTS_PRIVATE_EXPORT PercentBarChartItem : public AbstractBarChartItem
 {
     Q_OBJECT
 public:
diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries.h b/src/charts/barchart/vertical/percent/qpercentbarseries.h
index e5545ec6..71ecdcf9 100644
--- a/src/charts/barchart/vertical/percent/qpercentbarseries.h
+++ b/src/charts/barchart/vertical/percent/qpercentbarseries.h
@@ -37,7 +37,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 
 class QPercentBarSeriesPrivate;
 
-class QT_CHARTS_EXPORT QPercentBarSeries : public QAbstractBarSeries
+class Q_CHARTS_EXPORT QPercentBarSeries : public QAbstractBarSeries
 {
     Q_OBJECT
 public:
diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries_p.h b/src/charts/barchart/vertical/percent/qpercentbarseries_p.h
index 7a422410..96dd0d77 100644
--- a/src/charts/barchart/vertical/percent/qpercentbarseries_p.h
+++ b/src/charts/barchart/vertical/percent/qpercentbarseries_p.h
@@ -46,7 +46,7 @@
 QT_CHARTS_BEGIN_NAMESPACE
 
 
-class QT_CHARTS_PRIVATE_EXPORT QPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate
+class Q_CHARTS_PRIVATE_EXPORT QPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate
 {
 public:
     QPercentBarSeriesPrivate(QPercentBarSeries *q);
diff --git a/src/charts/barchart/vertical/stacked/qstackedbarseries.h b/src/charts/barchart/vertical/stacked/qstackedbarseries.h
index d6032350..466baf08 100644
--- a/src/charts/barchart/vertical/stacked/qstackedbarseries.h
+++ b/src/charts/barchart/vertical/stacked/qstackedbarseries.h
@@ -37,7 +37,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 
 class QStackedBarSeriesPrivate;
 
-class QT_CHARTS_EXPORT QStackedBarSeries : public QAbstractBarSeries
+class Q_CHARTS_EXPORT QStackedBarSeries : public QAbstractBarSeries
 {
     Q_OBJECT
 public:
diff --git a/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h b/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h
index 94916dfe..5b9d4cd4 100644
--- a/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h
+++ b/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h
@@ -46,7 +46,7 @@
 QT_CHARTS_BEGIN_NAMESPACE
 
 
-class QT_CHARTS_PRIVATE_EXPORT QStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate
+class Q_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 58ea7264..cef0aec9 100644
--- a/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h
+++ b/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h
@@ -47,7 +47,7 @@
 
 QT_CHARTS_BEGIN_NAMESPACE
 
-class QT_CHARTS_PRIVATE_EXPORT StackedBarChartItem : public AbstractBarChartItem
+class Q_CHARTS_PRIVATE_EXPORT StackedBarChartItem : public AbstractBarChartItem
 {
     Q_OBJECT
 public: