diff options
39 files changed, 356 insertions, 121 deletions
diff --git a/src/chartsqml2/chartsqml2.pro b/src/chartsqml2/chartsqml2.pro index 57407e4d..57b3bd37 100644 --- a/src/chartsqml2/chartsqml2.pro +++ b/src/chartsqml2/chartsqml2.pro @@ -1,6 +1,7 @@ TARGET = qtchartsqml2 CXX_MODULE = charts +DEFINES += QT_BUILD_QMLCHARTS_LIB QT += qml quick QT += charts charts-private @@ -27,30 +28,33 @@ SOURCES += \ declarativechartnode.cpp \ declarativecandlestickseries.cpp -HEADERS += \ - declarativechart.h \ - declarativexypoint.h \ - declarativexyseries.h \ - declarativelineseries.h \ - declarativesplineseries.h \ - declarativeareaseries.h \ - declarativescatterseries.h \ - declarativepieseries.h \ - declarativebarseries.h \ - declarativecategoryaxis.h \ - declarativemargins.h \ - declarativeaxes.h \ - declarativepolarchart.h \ - declarativeboxplotseries.h \ - declarativechartnode.h \ - declarativecandlestickseries.h \ - declarativeabstractrendernode.h +PRIVATE_HEADERS += \ + declarativechart_p.h \ + declarativexypoint_p.h \ + declarativexyseries_p.h \ + declarativelineseries_p.h \ + declarativesplineseries_p.h \ + declarativeareaseries_p.h \ + declarativescatterseries_p.h \ + declarativepieseries_p.h \ + declarativebarseries_p.h \ + declarativecategoryaxis_p.h \ + declarativemargins_p.h \ + declarativeaxes_p.h \ + declarativepolarchart_p.h \ + declarativeboxplotseries_p.h \ + declarativecandlestickseries_p.h \ + declarativeabstractrendernode_p.h \ + declarativechartnode_p.h \ + declarativechartglobal_p.h contains(QT_CONFIG, opengl) { SOURCES += declarativeopenglrendernode.cpp - HEADERS += declarativeopenglrendernode.h + PRIVATE_HEADERS += declarativeopenglrendernode_p.h } +HEADERS += $$PRIVATE_HEADERS +INCLUDEPATH += $$PWD load(qml_plugin) diff --git a/src/chartsqml2/chartsqml2_plugin.cpp b/src/chartsqml2/chartsqml2_plugin.cpp index cc95948b..b1a9d412 100644 --- a/src/chartsqml2/chartsqml2_plugin.cpp +++ b/src/chartsqml2/chartsqml2_plugin.cpp @@ -31,27 +31,27 @@ #include <QtCharts/QAbstractAxis> #include <QtCharts/QValueAxis> #include <QtCharts/QLogValueAxis> -#include "declarativecategoryaxis.h" +#include "declarativecategoryaxis_p.h" #include <QtCharts/QBarCategoryAxis> -#include "declarativechart.h" -#include "declarativepolarchart.h" -#include "declarativexypoint.h" -#include "declarativelineseries.h" -#include "declarativesplineseries.h" -#include "declarativeareaseries.h" -#include "declarativescatterseries.h" -#include "declarativebarseries.h" -#include "declarativeboxplotseries.h" -#include "declarativecandlestickseries.h" -#include "declarativepieseries.h" -#include "declarativeaxes.h" +#include "declarativechart_p.h" +#include "declarativepolarchart_p.h" +#include "declarativexypoint_p.h" +#include "declarativelineseries_p.h" +#include "declarativesplineseries_p.h" +#include "declarativeareaseries_p.h" +#include "declarativescatterseries_p.h" +#include "declarativebarseries_p.h" +#include "declarativeboxplotseries_p.h" +#include "declarativecandlestickseries_p.h" +#include "declarativepieseries_p.h" +#include "declarativeaxes_p.h" #include <QtCharts/QVXYModelMapper> #include <QtCharts/QHXYModelMapper> #include <QtCharts/QHPieModelMapper> #include <QtCharts/QVPieModelMapper> #include <QtCharts/QHBarModelMapper> #include <QtCharts/QVBarModelMapper> -#include "declarativemargins.h" +#include "declarativemargins_p.h" #include <QtCharts/QAreaLegendMarker> #include <QtCharts/QBarLegendMarker> #include <QtCharts/QPieLegendMarker> diff --git a/src/chartsqml2/declarativeabstractrendernode.h b/src/chartsqml2/declarativeabstractrendernode_p.h index 34bd1d19..905b6385 100644 --- a/src/chartsqml2/declarativeabstractrendernode.h +++ b/src/chartsqml2/declarativeabstractrendernode_p.h @@ -27,6 +27,15 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVEABSTRACTRENDERNODE_H #define DECLARATIVEABSTRACTRENDERNODE_H @@ -34,10 +43,11 @@ #include <QtQuick/QSGNode> #include <QtQuick/QQuickWindow> #include <private/glxyseriesdata_p.h> +#include <private/declarativechartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class MouseEventResponse { +class QT_QMLCHARTS_PRIVATE_EXPORT MouseEventResponse { public: enum MouseEventType { None, @@ -61,7 +71,7 @@ public: const QXYSeries *series; }; -class DeclarativeAbstractRenderNode : public QSGRootNode +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeAbstractRenderNode : public QSGRootNode { public: DeclarativeAbstractRenderNode() {} diff --git a/src/chartsqml2/declarativeareaseries.cpp b/src/chartsqml2/declarativeareaseries.cpp index 73c5960a..be4b9037 100644 --- a/src/chartsqml2/declarativeareaseries.cpp +++ b/src/chartsqml2/declarativeareaseries.cpp @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#include "declarativeareaseries.h" -#include "declarativelineseries.h" +#include "declarativeareaseries_p.h" +#include "declarativelineseries_p.h" QT_CHARTS_BEGIN_NAMESPACE @@ -119,6 +119,6 @@ QBrush DeclarativeAreaSeries::brush() const return QAreaSeries::brush(); } -#include "moc_declarativeareaseries.cpp" +#include "moc_declarativeareaseries_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativeareaseries.h b/src/chartsqml2/declarativeareaseries_p.h index 24dfcc8a..b2c884be 100644 --- a/src/chartsqml2/declarativeareaseries.h +++ b/src/chartsqml2/declarativeareaseries_p.h @@ -27,16 +27,26 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVEAREASERIES_H #define DECLARATIVEAREASERIES_H #include <QtCharts/QAreaSeries> -#include "declarativeaxes.h" +#include <private/declarativechartglobal_p.h> +#include <private/declarativeaxes_p.h> QT_CHARTS_BEGIN_NAMESPACE class DeclarativeLineSeries; -class DeclarativeAreaSeries : public QAreaSeries +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeAreaSeries : public QAreaSeries { Q_OBJECT Q_PROPERTY(DeclarativeLineSeries *upperSeries READ upperSeries WRITE setUpperSeries) diff --git a/src/chartsqml2/declarativeaxes.cpp b/src/chartsqml2/declarativeaxes.cpp index 231f9c6e..334744c0 100644 --- a/src/chartsqml2/declarativeaxes.cpp +++ b/src/chartsqml2/declarativeaxes.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativeaxes.h" +#include "declarativeaxes_p.h" #include <QtCharts/QAbstractAxis> QT_CHARTS_BEGIN_NAMESPACE @@ -65,6 +65,6 @@ void DeclarativeAxes::setAxisYRight(QAbstractAxis *axis) emit axisYRightChanged(axis); } -#include "moc_declarativeaxes.cpp" +#include "moc_declarativeaxes_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativeaxes.h b/src/chartsqml2/declarativeaxes_p.h index 1115ee60..af5b13c2 100644 --- a/src/chartsqml2/declarativeaxes.h +++ b/src/chartsqml2/declarativeaxes_p.h @@ -27,17 +27,27 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVEAXES_H #define DECLARATIVEAXES_H #include <QtCharts/QChartGlobal> #include <QtCore/QObject> +#include <private/declarativechartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QAbstractAxis; -class DeclarativeAxes : public QObject +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeAxes : public QObject { Q_OBJECT Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) diff --git a/src/chartsqml2/declarativebarseries.cpp b/src/chartsqml2/declarativebarseries.cpp index d335f9d5..36a811bb 100644 --- a/src/chartsqml2/declarativebarseries.cpp +++ b/src/chartsqml2/declarativebarseries.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativebarseries.h" +#include "declarativebarseries_p.h" #include <QtCharts/QBarSet> #include <QtCharts/QVBarModelMapper> #include <QtCharts/QHBarModelMapper> @@ -513,6 +513,6 @@ DeclarativeBarSet *DeclarativeHorizontalPercentBarSeries::insert(int index, QStr return 0; } -#include "moc_declarativebarseries.cpp" +#include "moc_declarativebarseries_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativebarseries.h b/src/chartsqml2/declarativebarseries_p.h index 15ed554c..a419fb04 100644 --- a/src/chartsqml2/declarativebarseries.h +++ b/src/chartsqml2/declarativebarseries_p.h @@ -27,6 +27,15 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVEBARSERIES_H #define DECLARATIVEBARSERIES_H @@ -37,7 +46,8 @@ #include <QtCharts/QHorizontalStackedBarSeries> #include <QtCharts/QHorizontalPercentBarSeries> #include <QtCharts/QBarSet> -#include "declarativeaxes.h" +#include <private/declarativechartglobal_p.h> +#include <private/declarativeaxes_p.h> #include <QtQuick/QQuickItem> #include <QtQml/QQmlParserStatus> @@ -46,7 +56,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QChart; -class DeclarativeBarSet : public QBarSet +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBarSet : public QBarSet { Q_OBJECT Q_PROPERTY(QVariantList values READ values WRITE setValues) @@ -83,7 +93,7 @@ private: QImage m_brushImage; }; -class DeclarativeBarSeries : public QBarSeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBarSeries : public QBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -130,7 +140,7 @@ public: DeclarativeAxes *m_axes; }; -class DeclarativeStackedBarSeries : public QStackedBarSeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeStackedBarSeries : public QStackedBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -177,7 +187,7 @@ public: DeclarativeAxes *m_axes; }; -class DeclarativePercentBarSeries : public QPercentBarSeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativePercentBarSeries : public QPercentBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -224,7 +234,7 @@ public: DeclarativeAxes *m_axes; }; -class DeclarativeHorizontalBarSeries : public QHorizontalBarSeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalBarSeries : public QHorizontalBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -271,7 +281,7 @@ public: DeclarativeAxes *m_axes; }; -class DeclarativeHorizontalStackedBarSeries : public QHorizontalStackedBarSeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalStackedBarSeries : public QHorizontalStackedBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -318,7 +328,7 @@ public: DeclarativeAxes *m_axes; }; -class DeclarativeHorizontalPercentBarSeries : public QHorizontalPercentBarSeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalPercentBarSeries : public QHorizontalPercentBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativeboxplotseries.cpp b/src/chartsqml2/declarativeboxplotseries.cpp index bbc2316d..98feea82 100644 --- a/src/chartsqml2/declarativeboxplotseries.cpp +++ b/src/chartsqml2/declarativeboxplotseries.cpp @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#include "declarativebarseries.h" -#include "declarativeboxplotseries.h" +#include "declarativebarseries_p.h" +#include "declarativeboxplotseries_p.h" #include <QtCharts/QBoxSet> #include <QtCharts/QVBoxPlotModelMapper> @@ -493,6 +493,6 @@ void DeclarativeBoxPlotSeries::handleBrushChanged() } } -#include "moc_declarativeboxplotseries.cpp" +#include "moc_declarativeboxplotseries_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativeboxplotseries.h b/src/chartsqml2/declarativeboxplotseries_p.h index a1f3177e..e035f8e2 100644 --- a/src/chartsqml2/declarativeboxplotseries.h +++ b/src/chartsqml2/declarativeboxplotseries_p.h @@ -27,19 +27,29 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVEBOXPLOT_H #define DECLARATIVEBOXPLOT_H #include <QtCharts/QBoxSet> -#include "declarativeaxes.h" +#include <private/declarativeaxes_p.h> #include <QtCharts/QBoxPlotSeries> +#include <private/declarativechartglobal_p.h> #include <QtQuick/QQuickItem> #include <QtQml/QQmlParserStatus> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativeBoxSet : public QBoxSet +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBoxSet : public QBoxSet { Q_OBJECT Q_PROPERTY(QVariantList values READ values WRITE setValues) @@ -83,7 +93,7 @@ private: QImage m_brushImage; }; -class DeclarativeBoxPlotSeries : public QBoxPlotSeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBoxPlotSeries : public QBoxPlotSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativecandlestickseries.cpp b/src/chartsqml2/declarativecandlestickseries.cpp index 66e6cdbc..97a5d557 100644 --- a/src/chartsqml2/declarativecandlestickseries.cpp +++ b/src/chartsqml2/declarativecandlestickseries.cpp @@ -29,8 +29,8 @@ #include <QtCharts/QHCandlestickModelMapper> #include <QtCharts/QVCandlestickModelMapper> -#include "declarativeaxes.h" -#include "declarativecandlestickseries.h" +#include "declarativeaxes_p.h" +#include "declarativecandlestickseries_p.h" QT_CHARTS_BEGIN_NAMESPACE @@ -239,6 +239,6 @@ void DeclarativeCandlestickSeries::handleBrushChanged() } } -#include "moc_declarativecandlestickseries.cpp" +#include "moc_declarativecandlestickseries_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativecandlestickseries.h b/src/chartsqml2/declarativecandlestickseries_p.h index 9b7c0e37..96787de2 100644 --- a/src/chartsqml2/declarativecandlestickseries.h +++ b/src/chartsqml2/declarativecandlestickseries_p.h @@ -27,6 +27,15 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVECANDLESTICKSERIES_H #define DECLARATIVECANDLESTICKSERIES_H @@ -34,13 +43,14 @@ #include <QtCharts/QCandlestickSet> #include <QtQml/QQmlParserStatus> #include <QtQuick/QQuickItem> +#include <private/declarativechartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class DeclarativeAxes; class QAbstractAxis; -class DeclarativeCandlestickSet : public QCandlestickSet +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeCandlestickSet : public QCandlestickSet { Q_OBJECT Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged) diff --git a/src/chartsqml2/declarativecategoryaxis.cpp b/src/chartsqml2/declarativecategoryaxis.cpp index 21221404..dcfc928d 100644 --- a/src/chartsqml2/declarativecategoryaxis.cpp +++ b/src/chartsqml2/declarativecategoryaxis.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativecategoryaxis.h" +#include "declarativecategoryaxis_p.h" #include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE @@ -133,6 +133,6 @@ void DeclarativeCategoryAxis::setLabelsPosition(AxisLabelsPosition position) } } -#include "moc_declarativecategoryaxis.cpp" +#include "moc_declarativecategoryaxis_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativecategoryaxis.h b/src/chartsqml2/declarativecategoryaxis_p.h index 9f9ef90c..e50844b2 100644 --- a/src/chartsqml2/declarativecategoryaxis.h +++ b/src/chartsqml2/declarativecategoryaxis_p.h @@ -27,17 +27,27 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVECATEGORYAXIS_H #define DECLARATIVECATEGORYAXIS_H #include <QtCharts/QCategoryAxis> +#include <private/declarativechartglobal_p.h> #include <QtQml/QQmlListProperty> #include <QtQml/QQmlParserStatus> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativeCategoryRange : public QObject +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeCategoryRange : public QObject { Q_OBJECT Q_PROPERTY(qreal endValue READ endValue WRITE setEndValue) diff --git a/src/chartsqml2/declarativechart.cpp b/src/chartsqml2/declarativechart.cpp index 672a6b07..4782f3a4 100644 --- a/src/chartsqml2/declarativechart.cpp +++ b/src/chartsqml2/declarativechart.cpp @@ -27,26 +27,26 @@ ** ****************************************************************************/ -#include "declarativechart.h" +#include "declarativechart_p.h" #include <QtGui/QPainter> -#include "declarativelineseries.h" -#include "declarativeareaseries.h" -#include "declarativebarseries.h" -#include "declarativepieseries.h" -#include "declarativesplineseries.h" -#include "declarativeboxplotseries.h" -#include "declarativecandlestickseries.h" -#include "declarativescatterseries.h" -#include "declarativechartnode.h" -#include "declarativeabstractrendernode.h" +#include "declarativelineseries_p.h" +#include "declarativeareaseries_p.h" +#include "declarativebarseries_p.h" +#include "declarativepieseries_p.h" +#include "declarativesplineseries_p.h" +#include "declarativeboxplotseries_p.h" +#include "declarativecandlestickseries_p.h" +#include "declarativescatterseries_p.h" +#include "declarativechartnode_p.h" +#include "declarativeabstractrendernode_p.h" #include <QtCharts/QBarCategoryAxis> #include <QtCharts/QValueAxis> #include <QtCharts/QLogValueAxis> #include <QtCharts/QCategoryAxis> #include <private/qabstractseries_p.h> -#include "declarativemargins.h" +#include "declarativemargins_p.h" #include <private/chartdataset_p.h> -#include "declarativeaxes.h" +#include "declarativeaxes_p.h" #include <private/qchart_p.h> #include <private/chartpresenter_p.h> #include <QtCharts/QPolarChart> @@ -488,7 +488,7 @@ void DeclarativeChart::initChart(QChart::ChartType type) this, SLOT(changeMargins(int,int,int,int))); connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries*)), this, SLOT(handleSeriesAdded(QAbstractSeries*))); connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), this, SIGNAL(seriesRemoved(QAbstractSeries*))); - connect(m_chart, &QChart::plotAreaChanged, this, &DeclarativeChart::plotAreaChanged); + connect(m_chart, SIGNAL(plotAreaChanged(QRectF)), this, SIGNAL(plotAreaChanged(QRectF))); } void DeclarativeChart::handleSeriesAdded(QAbstractSeries *series) @@ -1469,6 +1469,6 @@ QPointF DeclarativeChart::mapToPosition(const QPointF &value, QAbstractSeries *s return m_chart->mapToPosition(value, series); } -#include "moc_declarativechart.cpp" +#include "moc_declarativechart_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativechart.h b/src/chartsqml2/declarativechart_p.h index 602e3b2c..1d8e6d31 100644 --- a/src/chartsqml2/declarativechart.h +++ b/src/chartsqml2/declarativechart_p.h @@ -27,11 +27,21 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVECHART_H #define DECLARATIVECHART_H #include <private/glxyseriesdata_p.h> -#include "declarativeabstractrendernode.h" +#include <private/declarativechartglobal_p.h> +#include <private/declarativeabstractrendernode_p.h> #include <QtCore/QtGlobal> #include <QtQuick/QQuickItem> @@ -47,7 +57,7 @@ class DeclarativeMargins; class Domain; class DeclarativeAxes; -class DeclarativeChart : public QQuickItem +class QT_QMLCHARTS_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 new file mode 100644 index 00000000..a897d4ca --- /dev/null +++ b/src/chartsqml2/declarativechartglobal_p.h @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + +#ifndef DECLARATIVECHARTGLOBAL_H +#define DECLARATIVECHARTGLOBAL_H + +#include <QtCore/QtGlobal> + +#ifndef QT_STATIC +# if defined(QT_BUILD_QMLCHARTS_LIB) +# define QT_QMLCHARTS_PRIVATE_EXPORT Q_DECL_EXPORT +# else +# define QT_QMLCHARTS_PRIVATE_EXPORT Q_DECL_IMPORT +# endif +#else +# define QT_QMLCHARTS_PRIVATE_EXPORT +#endif + +#endif // DECLARATIVECHARTGLOBAL_H diff --git a/src/chartsqml2/declarativechartnode.cpp b/src/chartsqml2/declarativechartnode.cpp index 0b8f5a5a..76fddbc5 100644 --- a/src/chartsqml2/declarativechartnode.cpp +++ b/src/chartsqml2/declarativechartnode.cpp @@ -27,15 +27,15 @@ ** ****************************************************************************/ -#include "declarativechartnode.h" -#include "declarativeabstractrendernode.h" +#include "declarativechartnode_p.h" +#include "declarativeabstractrendernode_p.h" #include <QtQuick/QQuickWindow> #include <QtQuick/QSGImageNode> #include <QtQuick/QSGRendererInterface> #ifndef QT_NO_OPENGL -# include "declarativeopenglrendernode.h" +# include "declarativeopenglrendernode_p.h" #endif QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativechartnode.h b/src/chartsqml2/declarativechartnode_p.h index c93307fc..cd7b9ee5 100644 --- a/src/chartsqml2/declarativechartnode.h +++ b/src/chartsqml2/declarativechartnode_p.h @@ -27,6 +27,15 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVECHARTNODE_P_H #define DECLARATIVECHARTNODE_P_H diff --git a/src/chartsqml2/declarativelineseries.cpp b/src/chartsqml2/declarativelineseries.cpp index 49ee3210..73febddd 100644 --- a/src/chartsqml2/declarativelineseries.cpp +++ b/src/chartsqml2/declarativelineseries.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativelineseries.h" +#include "declarativelineseries_p.h" QT_CHARTS_BEGIN_NAMESPACE @@ -109,6 +109,6 @@ void DeclarativeLineSeries::appendDeclarativeChildren(QQmlListProperty<QObject> // Empty implementation, children are parsed in componentComplete } -#include "moc_declarativelineseries.cpp" +#include "moc_declarativelineseries_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativelineseries.h b/src/chartsqml2/declarativelineseries_p.h index 39c63150..e3fcc14a 100644 --- a/src/chartsqml2/declarativelineseries.h +++ b/src/chartsqml2/declarativelineseries_p.h @@ -27,19 +27,29 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVELINESERIES_H #define DECLARATIVELINESERIES_H #include <QtCharts/QLineSeries> -#include "declarativexyseries.h" -#include "declarativeaxes.h" +#include <private/declarativechartglobal_p.h> +#include <private/declarativexyseries_p.h> +#include <private/declarativeaxes_p.h> #include <QtQml/QQmlListProperty> #include <QtQml/QQmlParserStatus> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativemargins.cpp b/src/chartsqml2/declarativemargins.cpp index a4284dbc..66891e2a 100644 --- a/src/chartsqml2/declarativemargins.cpp +++ b/src/chartsqml2/declarativemargins.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativemargins.h" +#include "declarativemargins_p.h" #include <QtCore/QDataStream> #include <QtCore/QDebug> @@ -123,6 +123,6 @@ void DeclarativeMargins::setRight(int right) } } -#include "moc_declarativemargins.cpp" +#include "moc_declarativemargins_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativemargins.h b/src/chartsqml2/declarativemargins_p.h index bbc6b0cb..b9c7ab0a 100644 --- a/src/chartsqml2/declarativemargins.h +++ b/src/chartsqml2/declarativemargins_p.h @@ -27,16 +27,26 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVE_MARGINS_H #define DECLARATIVE_MARGINS_H #include <QtCharts/QChartGlobal> #include <QtCore/QObject> #include <QtCore/QMargins> +#include <private/declarativechartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativeMargins : public QObject, public QMargins +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeMargins : public QObject, public QMargins { Q_OBJECT Q_PROPERTY(int top READ top WRITE setTop NOTIFY topChanged) diff --git a/src/chartsqml2/declarativeopenglrendernode.cpp b/src/chartsqml2/declarativeopenglrendernode.cpp index 742a9301..685c331b 100644 --- a/src/chartsqml2/declarativeopenglrendernode.cpp +++ b/src/chartsqml2/declarativeopenglrendernode.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativeopenglrendernode.h" +#include "declarativeopenglrendernode_p.h" #include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLFunctions> diff --git a/src/chartsqml2/declarativeopenglrendernode.h b/src/chartsqml2/declarativeopenglrendernode_p.h index a07ed324..d4bb2372 100644 --- a/src/chartsqml2/declarativeopenglrendernode.h +++ b/src/chartsqml2/declarativeopenglrendernode_p.h @@ -27,10 +27,19 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVEOPENGLRENDERNODE_P_H #define DECLARATIVEOPENGLRENDERNODE_P_H -#include "declarativeabstractrendernode.h" +#include <private/declarativeabstractrendernode_p.h> #include <QtCharts/QChartGlobal> #include <private/glxyseriesdata_p.h> diff --git a/src/chartsqml2/declarativepieseries.cpp b/src/chartsqml2/declarativepieseries.cpp index ade8e13e..300f5f37 100644 --- a/src/chartsqml2/declarativepieseries.cpp +++ b/src/chartsqml2/declarativepieseries.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativepieseries.h" +#include "declarativepieseries_p.h" #include <QtCharts/QPieSlice> #include <QtCharts/QVPieModelMapper> #include <QtCharts/QHPieModelMapper> @@ -158,6 +158,6 @@ void DeclarativePieSeries::handleRemoved(QList<QPieSlice *> slices) emit sliceRemoved(slice); } -#include "moc_declarativepieseries.cpp" +#include "moc_declarativepieseries_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativepieseries.h b/src/chartsqml2/declarativepieseries_p.h index 807783c6..33ff7586 100644 --- a/src/chartsqml2/declarativepieseries.h +++ b/src/chartsqml2/declarativepieseries_p.h @@ -27,18 +27,28 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVEPIESERIES_H #define DECLARATIVEPIESERIES_H #include <QtCharts/QPieSeries> #include <QtCharts/QPieSlice> +#include <private/declarativechartglobal_p.h> #include <QtQuick/QQuickItem> #include <QtQml/QQmlParserStatus> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativePieSlice : public QPieSlice +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativePieSlice : public QPieSlice { Q_OBJECT Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged) diff --git a/src/chartsqml2/declarativepolarchart.cpp b/src/chartsqml2/declarativepolarchart.cpp index bc366d85..b342a6d2 100644 --- a/src/chartsqml2/declarativepolarchart.cpp +++ b/src/chartsqml2/declarativepolarchart.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativepolarchart.h" +#include "declarativepolarchart_p.h" #include <QtCharts/QChart> QT_CHARTS_BEGIN_NAMESPACE @@ -78,6 +78,6 @@ DeclarativePolarChart::~DeclarativePolarChart() { } -#include "moc_declarativepolarchart.cpp" +#include "moc_declarativepolarchart_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativepolarchart.h b/src/chartsqml2/declarativepolarchart_p.h index beb0f694..3d82f822 100644 --- a/src/chartsqml2/declarativepolarchart.h +++ b/src/chartsqml2/declarativepolarchart_p.h @@ -27,17 +27,26 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVEPOLARCHART_H #define DECLARATIVEPOLARCHART_H #include <QtCore/QtGlobal> #include <QtQuick/QQuickItem> - -#include "declarativechart.h" +#include <private/declarativechartglobal_p.h> +#include <private/declarativechart_p.h> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativePolarChart : public DeclarativeChart +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativePolarChart : public DeclarativeChart { Q_OBJECT public: diff --git a/src/chartsqml2/declarativescatterseries.cpp b/src/chartsqml2/declarativescatterseries.cpp index d62847fb..e53b1984 100644 --- a/src/chartsqml2/declarativescatterseries.cpp +++ b/src/chartsqml2/declarativescatterseries.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativescatterseries.h" +#include "declarativescatterseries_p.h" QT_CHARTS_BEGIN_NAMESPACE @@ -119,6 +119,6 @@ void DeclarativeScatterSeries::handleBrushChanged() } } -#include "moc_declarativescatterseries.cpp" +#include "moc_declarativescatterseries_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativescatterseries.h b/src/chartsqml2/declarativescatterseries_p.h index 9515243a..c02ed47e 100644 --- a/src/chartsqml2/declarativescatterseries.h +++ b/src/chartsqml2/declarativescatterseries_p.h @@ -27,19 +27,29 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVESCATTERSERIES_H #define DECLARATIVESCATTERSERIES_H #include <QtCharts/QScatterSeries> -#include "declarativexyseries.h" -#include "declarativeaxes.h" +#include <private/declarativechartglobal_p.h> +#include <private/declarativexyseries_p.h> +#include <private/declarativeaxes_p.h> #include <QtQml/QQmlListProperty> #include <QtQml/QQmlParserStatus> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativesplineseries.cpp b/src/chartsqml2/declarativesplineseries.cpp index 25e3e873..bcbfef14 100644 --- a/src/chartsqml2/declarativesplineseries.cpp +++ b/src/chartsqml2/declarativesplineseries.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativesplineseries.h" +#include "declarativesplineseries_p.h" QT_CHARTS_BEGIN_NAMESPACE @@ -109,6 +109,6 @@ void DeclarativeSplineSeries::appendDeclarativeChildren(QQmlListProperty<QObject // Empty implementation, children are parsed in componentComplete } -#include "moc_declarativesplineseries.cpp" +#include "moc_declarativesplineseries_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativesplineseries.h b/src/chartsqml2/declarativesplineseries_p.h index aa5f22ad..d6369a87 100644 --- a/src/chartsqml2/declarativesplineseries.h +++ b/src/chartsqml2/declarativesplineseries_p.h @@ -27,19 +27,29 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVESPLINESERIES_H #define DECLARATIVESPLINESERIES_H #include <QtCharts/QSplineSeries> -#include "declarativexyseries.h" -#include "declarativeaxes.h" +#include <private/declarativechartglobal_p.h> +#include <private/declarativexyseries_p.h> +#include <private/declarativeaxes_p.h> #include <QtQml/QQmlListProperty> #include <QtQml/QQmlParserStatus> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativexypoint.cpp b/src/chartsqml2/declarativexypoint.cpp index 91ade7c2..332ea165 100644 --- a/src/chartsqml2/declarativexypoint.cpp +++ b/src/chartsqml2/declarativexypoint.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativexypoint.h" +#include "declarativexypoint_p.h" #include <QtCore/QDataStream> QT_CHARTS_BEGIN_NAMESPACE @@ -62,6 +62,6 @@ DeclarativeXYPoint::DeclarativeXYPoint(QObject *parent) : setY(0.0); } -#include "moc_declarativexypoint.cpp" +#include "moc_declarativexypoint_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativexypoint.h b/src/chartsqml2/declarativexypoint_p.h index feb0af05..316ff962 100644 --- a/src/chartsqml2/declarativexypoint.h +++ b/src/chartsqml2/declarativexypoint_p.h @@ -27,16 +27,26 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVE_XY_POINT_H #define DECLARATIVE_XY_POINT_H #include <QtCharts/QChartGlobal> +#include <private/declarativechartglobal_p.h> #include <QtCore/QObject> #include <QtCore/QPointF> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativeXYPoint : public QObject, public QPointF +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeXYPoint : public QObject, public QPointF { Q_OBJECT Q_PROPERTY(qreal x READ x WRITE setX) diff --git a/src/chartsqml2/declarativexyseries.cpp b/src/chartsqml2/declarativexyseries.cpp index 1d38cf68..88c971e9 100644 --- a/src/chartsqml2/declarativexyseries.cpp +++ b/src/chartsqml2/declarativexyseries.cpp @@ -28,8 +28,8 @@ ****************************************************************************/ -#include "declarativexyseries.h" -#include "declarativexypoint.h" +#include "declarativexyseries_p.h" +#include "declarativexypoint_p.h" #include <QtCharts/QVXYModelMapper> #include <QtCharts/QHXYModelMapper> diff --git a/src/chartsqml2/declarativexyseries.h b/src/chartsqml2/declarativexyseries_p.h index 26da8c42..e78fde67 100644 --- a/src/chartsqml2/declarativexyseries.h +++ b/src/chartsqml2/declarativexyseries_p.h @@ -27,17 +27,27 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart 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. + #ifndef DECLARATIVE_XY_SERIES_H #define DECLARATIVE_XY_SERIES_H #include <QtCharts/QXYSeries> +#include <private/declarativechartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QChart; class QAbstractSeries; -class DeclarativeXySeries +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeXySeries { public: explicit DeclarativeXySeries(); diff --git a/sync.profile b/sync.profile index 80332926..f21cc199 100644 --- a/sync.profile +++ b/sync.profile @@ -1,5 +1,5 @@ %modules = ( # path to module name map - "QtCharts" => "$basedir/src/charts", + "QtCharts" => "$basedir/src/charts;^$basedir/src/chartsqml2", ); %moduleheaders = ( # restrict the module headers to those found in relative path ); |