From a35a20ca587d8c2868f63b7f807d6ea5cb460354 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 2 Nov 2021 12:59:30 +0100 Subject: Migrate to autogenerated cpp exports in the ChartsQml module Adjust private export name of ChartsQml to the generated one. Task-number: QTBUG-90492 Change-Id: I39f16166f97ae91587553a22bfdbfd33a96564cf Reviewed-by: Qt CI Bot Reviewed-by: Miikka Heikkinen Reviewed-by: Alexandru Croitor --- src/chartsqml2/CMakeLists.txt | 2 ++ src/chartsqml2/declarativeabstractrendernode_p.h | 4 ++-- src/chartsqml2/declarativeareaseries_p.h | 2 +- src/chartsqml2/declarativeaxes_p.h | 2 +- src/chartsqml2/declarativebarseries_p.h | 14 +++++++------- src/chartsqml2/declarativeboxplotseries_p.h | 4 ++-- src/chartsqml2/declarativecandlestickseries_p.h | 2 +- src/chartsqml2/declarativecategoryaxis_p.h | 2 +- src/chartsqml2/declarativechart_p.h | 2 +- src/chartsqml2/declarativechartglobal_p.h | 13 ++----------- src/chartsqml2/declarativelineseries_p.h | 2 +- src/chartsqml2/declarativemargins_p.h | 2 +- src/chartsqml2/declarativepieseries_p.h | 2 +- src/chartsqml2/declarativepolarchart_p.h | 2 +- src/chartsqml2/declarativescatterseries_p.h | 2 +- src/chartsqml2/declarativesplineseries_p.h | 2 +- src/chartsqml2/declarativexypoint_p.h | 2 +- src/chartsqml2/declarativexyseries_p.h | 2 +- 18 files changed, 28 insertions(+), 35 deletions(-) diff --git a/src/chartsqml2/CMakeLists.txt b/src/chartsqml2/CMakeLists.txt index f62430ca..539543b5 100644 --- a/src/chartsqml2/CMakeLists.txt +++ b/src/chartsqml2/CMakeLists.txt @@ -33,6 +33,8 @@ qt_internal_add_qml_module(ChartsQml Qt::Gui Qt::Qml Qt::Quick + GENERATE_CPP_EXPORTS + GENERATE_PRIVATE_CPP_EXPORTS ) qt_internal_extend_target(ChartsQml CONDITION QT_FEATURE_opengl diff --git a/src/chartsqml2/declarativeabstractrendernode_p.h b/src/chartsqml2/declarativeabstractrendernode_p.h index 955085e3..2790f928 100644 --- a/src/chartsqml2/declarativeabstractrendernode_p.h +++ b/src/chartsqml2/declarativeabstractrendernode_p.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCHARTS_PRIVATE_EXPORT MouseEventResponse { +class Q_CHARTSQML_PRIVATE_EXPORT MouseEventResponse { public: enum MouseEventType { None, @@ -71,7 +71,7 @@ public: const QXYSeries *series; }; -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeAbstractRenderNode : public QSGRootNode +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeAbstractRenderNode : public QSGRootNode { public: DeclarativeAbstractRenderNode() {} diff --git a/src/chartsqml2/declarativeareaseries_p.h b/src/chartsqml2/declarativeareaseries_p.h index 7ecf7d89..3bbe95a7 100644 --- a/src/chartsqml2/declarativeareaseries_p.h +++ b/src/chartsqml2/declarativeareaseries_p.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeAreaSeries : public QAreaSeries +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeAreaSeries : public QAreaSeries { Q_OBJECT Q_PROPERTY(DeclarativeLineSeries *upperSeries READ upperSeries WRITE setUpperSeries) diff --git a/src/chartsqml2/declarativeaxes_p.h b/src/chartsqml2/declarativeaxes_p.h index c1ec64ab..27ed47ea 100644 --- a/src/chartsqml2/declarativeaxes_p.h +++ b/src/chartsqml2/declarativeaxes_p.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeAxes : public QObject +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeAxes : public QObject { Q_OBJECT Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) diff --git a/src/chartsqml2/declarativebarseries_p.h b/src/chartsqml2/declarativebarseries_p.h index 01945d1b..232aa414 100644 --- a/src/chartsqml2/declarativebarseries_p.h +++ b/src/chartsqml2/declarativebarseries_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE class QChart; -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeBarSet : public QBarSet +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeBarSet : public QBarSet { Q_OBJECT Q_PROPERTY(QVariantList values READ values WRITE setValues) @@ -97,7 +97,7 @@ private: QImage m_brushImage; }; -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeBarSeries : public QBarSeries, public QQmlParserStatus +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeBarSeries : public QBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -147,7 +147,7 @@ public: DeclarativeAxes *m_axes; }; -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeStackedBarSeries : public QStackedBarSeries, public QQmlParserStatus +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeStackedBarSeries : public QStackedBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -197,7 +197,7 @@ public: DeclarativeAxes *m_axes; }; -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativePercentBarSeries : public QPercentBarSeries, public QQmlParserStatus +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativePercentBarSeries : public QPercentBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -247,7 +247,7 @@ public: DeclarativeAxes *m_axes; }; -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalBarSeries : public QHorizontalBarSeries, public QQmlParserStatus +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeHorizontalBarSeries : public QHorizontalBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -297,7 +297,7 @@ public: DeclarativeAxes *m_axes; }; -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalStackedBarSeries : public QHorizontalStackedBarSeries, public QQmlParserStatus +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeHorizontalStackedBarSeries : public QHorizontalStackedBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -347,7 +347,7 @@ public: DeclarativeAxes *m_axes; }; -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalPercentBarSeries : public QHorizontalPercentBarSeries, public QQmlParserStatus +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeHorizontalPercentBarSeries : public QHorizontalPercentBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativeboxplotseries_p.h b/src/chartsqml2/declarativeboxplotseries_p.h index c002b84e..850ff3fa 100644 --- a/src/chartsqml2/declarativeboxplotseries_p.h +++ b/src/chartsqml2/declarativeboxplotseries_p.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeBoxSet : public QBoxSet +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeBoxSet : public QBoxSet { Q_OBJECT Q_PROPERTY(QVariantList values READ values WRITE setValues) @@ -97,7 +97,7 @@ private: QImage m_brushImage; }; -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeBoxPlotSeries : public QBoxPlotSeries, public QQmlParserStatus +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeBoxPlotSeries : public QBoxPlotSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativecandlestickseries_p.h b/src/chartsqml2/declarativecandlestickseries_p.h index 2f15d692..50a39fde 100644 --- a/src/chartsqml2/declarativecandlestickseries_p.h +++ b/src/chartsqml2/declarativecandlestickseries_p.h @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE class DeclarativeAxes; -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeCandlestickSet : public QCandlestickSet +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeCandlestickSet : public QCandlestickSet { Q_OBJECT Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged) diff --git a/src/chartsqml2/declarativecategoryaxis_p.h b/src/chartsqml2/declarativecategoryaxis_p.h index bea61ec8..4a5fcddf 100644 --- a/src/chartsqml2/declarativecategoryaxis_p.h +++ b/src/chartsqml2/declarativecategoryaxis_p.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeCategoryRange : public QObject +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeCategoryRange : public QObject { Q_OBJECT Q_PROPERTY(qreal endValue READ endValue WRITE setEndValue) diff --git a/src/chartsqml2/declarativechart_p.h b/src/chartsqml2/declarativechart_p.h index 17976faa..0a4eace1 100644 --- a/src/chartsqml2/declarativechart_p.h +++ b/src/chartsqml2/declarativechart_p.h @@ -61,7 +61,7 @@ class DeclarativeMargins; class Domain; class DeclarativeAxes; -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeChart : public QQuickItem +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeChart : public QQuickItem { Q_OBJECT Q_PROPERTY(Theme theme READ theme WRITE setTheme) diff --git a/src/chartsqml2/declarativechartglobal_p.h b/src/chartsqml2/declarativechartglobal_p.h index dba467c6..8bcbc986 100644 --- a/src/chartsqml2/declarativechartglobal_p.h +++ b/src/chartsqml2/declarativechartglobal_p.h @@ -41,17 +41,8 @@ #include #include +#include -#ifndef QT_STATIC -# if defined(QT_BUILD_QMLCHARTS_LIB) -# define Q_QMLCHARTS_PRIVATE_EXPORT Q_DECL_EXPORT -# else -# define Q_QMLCHARTS_PRIVATE_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_QMLCHARTS_PRIVATE_EXPORT -#endif - -void Q_QMLCHARTS_PRIVATE_EXPORT qml_register_types_QtCharts(); +void Q_CHARTSQML_PRIVATE_EXPORT qml_register_types_QtCharts(); #endif // DECLARATIVECHARTGLOBAL_H diff --git a/src/chartsqml2/declarativelineseries_p.h b/src/chartsqml2/declarativelineseries_p.h index 19203e4e..c68700c4 100644 --- a/src/chartsqml2/declarativelineseries_p.h +++ b/src/chartsqml2/declarativelineseries_p.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, public QQmlParserStatus +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativemargins_p.h b/src/chartsqml2/declarativemargins_p.h index cd8604a2..5545a7e4 100644 --- a/src/chartsqml2/declarativemargins_p.h +++ b/src/chartsqml2/declarativemargins_p.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeMargins : public QObject, public QMargins +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeMargins : public QObject, public QMargins { Q_OBJECT Q_PROPERTY(int top READ top WRITE setTop NOTIFY topChanged) diff --git a/src/chartsqml2/declarativepieseries_p.h b/src/chartsqml2/declarativepieseries_p.h index 118539da..2311aeb5 100644 --- a/src/chartsqml2/declarativepieseries_p.h +++ b/src/chartsqml2/declarativepieseries_p.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativePieSlice : public QPieSlice +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativePieSlice : public QPieSlice { Q_OBJECT Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged) diff --git a/src/chartsqml2/declarativepolarchart_p.h b/src/chartsqml2/declarativepolarchart_p.h index ddefef89..400c1df2 100644 --- a/src/chartsqml2/declarativepolarchart_p.h +++ b/src/chartsqml2/declarativepolarchart_p.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativePolarChart : public DeclarativeChart +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativePolarChart : public DeclarativeChart { Q_OBJECT QML_NAMED_ELEMENT(PolarChartView) diff --git a/src/chartsqml2/declarativescatterseries_p.h b/src/chartsqml2/declarativescatterseries_p.h index ae0a3ff2..d4de8a29 100644 --- a/src/chartsqml2/declarativescatterseries_p.h +++ b/src/chartsqml2/declarativescatterseries_p.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QQmlParserStatus +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativesplineseries_p.h b/src/chartsqml2/declarativesplineseries_p.h index 754f89aa..1f21d02e 100644 --- a/src/chartsqml2/declarativesplineseries_p.h +++ b/src/chartsqml2/declarativesplineseries_p.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QQmlParserStatus +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativexypoint_p.h b/src/chartsqml2/declarativexypoint_p.h index fbfd0d73..6df7163b 100644 --- a/src/chartsqml2/declarativexypoint_p.h +++ b/src/chartsqml2/declarativexypoint_p.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeXYPoint : public QObject, public QPointF +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeXYPoint : public QObject, public QPointF { Q_OBJECT Q_PROPERTY(qreal x READ x WRITE setX) diff --git a/src/chartsqml2/declarativexyseries_p.h b/src/chartsqml2/declarativexyseries_p.h index 5c549d1a..17365255 100644 --- a/src/chartsqml2/declarativexyseries_p.h +++ b/src/chartsqml2/declarativexyseries_p.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE class QChart; -class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeXySeries +class Q_CHARTSQML_PRIVATE_EXPORT DeclarativeXySeries { public: explicit DeclarativeXySeries(); -- cgit v1.2.3