diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-06-04 09:43:59 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-06-04 09:49:17 +0300 |
commit | 11500bb02eb2d24d477bb7d56915cd71a37bf718 (patch) | |
tree | 1f71c99e3bf2c37b5045ab1f4952939ead4a1fd2 /plugins | |
parent | f50896eb9f2bf1ff098ce9e1c6904ede81cf46cf (diff) |
Fix Qt5 building of quick2 plugin
Recent boxplot changes broke the build.
Change-Id: I59a6215220a4fb018bb3c6a9674b4f82cd6fc62c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/declarative/declarativeboxplotseries.cpp | 8 | ||||
-rw-r--r-- | plugins/declarative/declarativeboxplotseries.h | 21 |
2 files changed, 21 insertions, 8 deletions
diff --git a/plugins/declarative/declarativeboxplotseries.cpp b/plugins/declarative/declarativeboxplotseries.cpp index 64507efe..ffb45263 100644 --- a/plugins/declarative/declarativeboxplotseries.cpp +++ b/plugins/declarative/declarativeboxplotseries.cpp @@ -50,7 +50,7 @@ void DeclarativeBoxSet::setValues(QVariantList values) // ===================================================== -DeclarativeBoxPlotSeries::DeclarativeBoxPlotSeries(QDeclarativeItem *parent) : +DeclarativeBoxPlotSeries::DeclarativeBoxPlotSeries(QDECLARATIVE_ITEM *parent) : QBoxPlotSeries(parent), m_axes(new DeclarativeAxes(this)) { @@ -78,12 +78,12 @@ void DeclarativeBoxPlotSeries::componentComplete() } } -QDeclarativeListProperty<QObject> DeclarativeBoxPlotSeries::seriesChildren() +QDECLARATIVE_LIST_PROPERTY<QObject> DeclarativeBoxPlotSeries::seriesChildren() { - return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeBoxPlotSeries::appendSeriesChildren); + return QDECLARATIVE_LIST_PROPERTY<QObject>(this, 0, &DeclarativeBoxPlotSeries::appendSeriesChildren LIST_PROPERTY_PARAM_DEFAULTS); } -void DeclarativeBoxPlotSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element) +void DeclarativeBoxPlotSeries::appendSeriesChildren(QDECLARATIVE_LIST_PROPERTY<QObject> *list, QObject *element) { // Empty implementation; the children are parsed in componentComplete instead Q_UNUSED(list); diff --git a/plugins/declarative/declarativeboxplotseries.h b/plugins/declarative/declarativeboxplotseries.h index 4822b717..26336ff8 100644 --- a/plugins/declarative/declarativeboxplotseries.h +++ b/plugins/declarative/declarativeboxplotseries.h @@ -24,8 +24,13 @@ #include "qboxset.h" #include "declarativeaxes.h" #include "qboxplotseries.h" +#ifdef CHARTS_FOR_QUICK2 +#include <QtQuick/QQuickItem> +#include <QtQml/QQmlParserStatus> +#else #include <QtDeclarative/QDeclarativeItem> #include <QtDeclarative/QDeclarativeParserStatus> +#endif QTCOMMERCIALCHART_BEGIN_NAMESPACE @@ -62,19 +67,27 @@ Q_SIGNALS: void changedValue(int index); }; -class DeclarativeBoxPlotSeries : public QBoxPlotSeries, public QDeclarativeParserStatus +class DeclarativeBoxPlotSeries : public QBoxPlotSeries, public QDECLARATIVE_PARSER_STATUS { Q_OBJECT +#ifdef CHARTS_FOR_QUICK2 + Q_INTERFACES(QQmlParserStatus) +#else Q_INTERFACES(QDeclarativeParserStatus) +#endif Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged) Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged) Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged) +#ifdef CHARTS_FOR_QUICK2 + Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren) +#else Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren) +#endif Q_CLASSINFO("DefaultProperty", "seriesChildren") public: - explicit DeclarativeBoxPlotSeries(QDeclarativeItem *parent = 0); + explicit DeclarativeBoxPlotSeries(QDECLARATIVE_ITEM *parent = 0); QAbstractAxis *axisX() { return m_axes->axisX(); } void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } QAbstractAxis *axisY() { return m_axes->axisY(); } @@ -83,7 +96,7 @@ public: void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - QDeclarativeListProperty<QObject> seriesChildren(); + QDECLARATIVE_LIST_PROPERTY<QObject> seriesChildren(); public: Q_INVOKABLE DeclarativeBoxSet *at(int index); @@ -106,7 +119,7 @@ Q_SIGNALS: void hovered(bool status, DeclarativeBoxSet *boxset); public Q_SLOTS: - static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element); + static void appendSeriesChildren(QDECLARATIVE_LIST_PROPERTY<QObject> *list, QObject *element); void onHovered(bool status, QBoxSet *boxset); void onClicked(QBoxSet *boxset); |