HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2780:740f4f94adf8

Added possibility to set labels position for QCategoryAxis...

Titta Heikkala -

r2780:740f4f94adf8

parent child

Context file:

r2780:740f4f94adf8

Collapse all files

src/charts/axis/categoryaxis/qcategoryaxis.cpp +36 -1

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #include <QtCharts/QCategoryAxis>
             #include <private/qcategoryaxis_p.h>
             #include <private/chartcategoryaxisx_p.h>
             #include <private/chartcategoryaxisy_p.h>
             #include <private/polarchartcategoryaxisangular_p.h>
             #include <private/polarchartcategoryaxisradial_p.h>
             #include <QtCharts/QChart>
             #include <QtCore/QtMath>
             #include <QtCore/QDebug>
             QT_CHARTS_BEGIN_NAMESPACE
             /*!
                 \class QCategoryAxis
                 \inmodule Qt Charts
                 \brief The QCategoryAxis class allows putting a named ranges on the axis.
                 \mainclass
                 This class can be used when the underlying data needs to be given extra meaning.
                 Unlike with the QBarCategoryAxis the QCategoryAxis allows the categories ranges widths to be specified freely.
                 Example code on how to use QCategoryAxis:
                 \image api_category_axis.png
                 \code
                 QChartView *chartView = new QChartView;
                 QLineSeries *series = new QLineSeries;
                 // ...
                 chartView->chart()->addSeries(series);
                 QCategoryAxis *axisY = new QCategoryAxis;
                 axisY->setMin(0);
                 axisY->setMax(52);
                 axisY->setStartValue(15);
                 axisY->append("First", 20);
                 axisY->append("Second", 37);
                 axisY->append("Third", 52);
                 chartView->chart()->setAxisY(axisY, series);
                 \endcode
             */
             /*!
                 \qmltype CategoryAxis
                 \instantiates QCategoryAxis
                 \inqmlmodule QtCharts
                 \inherits AbstractAxis
                 \brief CategoryAxis allows putting a named ranges on the axis.
                 For example:
                 \image examples_qmlaxes3.png
                 \snippet qmlaxes/qml/qmlaxes/View3.qml 1
             */
             /*!
               \property QCategoryAxis::startValue
               Defines the low end of the first category on the axis.
             */
             /*!
               \qmlproperty int CategoryAxis::startValue
               Defines the low end of the first category on the axis.
             */
             /*!
               \property QCategoryAxis::count
               The count of categories.
             */
             /*!
               \qmlproperty int CategoryAxis::count
               The count of categories.
             */
             /*!
               \property QCategoryAxis::categoriesLabels
               The category labels as a string list.
             */
             /*!
               \qmlproperty StringList CategoryAxis::categoriesLabels
               The category labels as a list of strings.
             */
             /*!
               \fn void QCategoryAxis::categoriesChanged()
               Axis emits signal when the categories of the axis have changed.
             */
+            /*!
+             \enum QCategoryAxis::AxisLabelsPosition
+             This enum describes the position of the category labels.
+             \value AxisLabelsPositionCenter Labels are centered to category.
+             \value AxisLabelsPositionOnValue Labels are positioned to the high end limit of the category.
+             */
+            /*!
+              \property QCategoryAxis::labelsPosition
+              Defines the position of the category labels. The labels in the beginning and in the end of the
+              axes may overlap other axes labels when positioned on value.
+            */
+            /*!
+              \qmlproperty AxisLabelsPosition CategoryAxis::labelsPosition
+              Defines the position of the category labels. The labels in the beginning and in the end of the
+              axes may overlap other axes labels when positioned on value.
+            */
             /*!
                 Constructs an axis object which is a child of \a parent.
             */
             QCategoryAxis::QCategoryAxis(QObject *parent):
                 QValueAxis(*new QCategoryAxisPrivate(this), parent)
             {
             }
             /*!
                 Destroys the object
             */
             QCategoryAxis::~QCategoryAxis()
             {
                 Q_D(QCategoryAxis);
                 if (d->m_chart)
                     d->m_chart->removeAxis(this);
             }
             /*!
                 \internal
             */
             QCategoryAxis::QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent): QValueAxis(d, parent)
             {
             }
             /*!
                 \qmlmethod CategoryAxis::append(string label, real endValue)
                 Appends new category to the axis with an \a label. Category label has to be unique.
                 Parameter \a endValue specifies the high end limit of the category.
                 It has to be greater than the high end limit of the previous category.
                 Otherwise the method returns without adding a new category.
             */
             /*!
                 Appends new category to the axis with an \a categoryLabel.
                 Category label has to be unique.
                 Parameter \a categoryEndValue specifies the high end limit of the category.
                 It has to be greater than the high end limit of the previous category.
                 Otherwise the method returns without adding a new category.
             */
             void QCategoryAxis::append(const QString &categoryLabel, qreal categoryEndValue)
             {
                 Q_D(QCategoryAxis);
                 if (!d->m_categories.contains(categoryLabel)) {
                     if (d->m_categories.isEmpty()) {
                         Range range(d->m_categoryMinimum, categoryEndValue);
                         d->m_categoriesMap.insert(categoryLabel, range);
                         d->m_categories.append(categoryLabel);
                         emit categoriesChanged();
                     } else if (categoryEndValue > endValue(d->m_categories.last())) {
                         Range previousRange = d->m_categoriesMap.value(d->m_categories.last());
                         d->m_categoriesMap.insert(categoryLabel, Range(previousRange.second, categoryEndValue));
                         d->m_categories.append(categoryLabel);
                         emit categoriesChanged();
                     }
                 }
             }
             /*!
                 Sets \a min to be the low end limit of the first category on the axis.
                 If there is already some categories added to the axis then passed value must be lower than the high end value of the already defined first category range.
                 Otherwise nothing is done.
             */
             void QCategoryAxis::setStartValue(qreal min)
             {
                 Q_D(QCategoryAxis);
                 if (d->m_categories.isEmpty()) {
                     d->m_categoryMinimum = min;
                     emit categoriesChanged();
                 } else {
                     Range range = d->m_categoriesMap.value(d->m_categories.first());
                     if (min < range.second) {
                         d->m_categoriesMap.insert(d->m_categories.first(), Range(min, range.second));
                         emit categoriesChanged();
                     }
                 }
             }
             /*!
                 Returns the low end limit of the category specified by an \a categoryLabel
             */
             qreal QCategoryAxis::startValue(const QString &categoryLabel) const
             {
                 Q_D(const QCategoryAxis);
                 if (categoryLabel.isEmpty())
                     return d->m_categoryMinimum;
                 return d->m_categoriesMap.value(categoryLabel).first;
             }
             /*!
                 Returns the high end limit of the interval specified by an \a categoryLabel
             */
             qreal QCategoryAxis::endValue(const QString &categoryLabel) const
             {
                 Q_D(const QCategoryAxis);
                 return d->m_categoriesMap.value(categoryLabel).second;
             }
             /*!
                 \qmlmethod CategoryAxis::remove(string label)
                 Removes a category specified by the \a label from the axis
             */
             /*!
                 Removes an interval specified by the \a categoryLabel from the axis
             */
             void QCategoryAxis::remove(const QString &categoryLabel)
             {
                 Q_D(QCategoryAxis);
                 int labelIndex = d->m_categories.indexOf(categoryLabel);
                 // check if such label exists
                 if (labelIndex != -1) {
                     d->m_categories.removeAt(labelIndex);
                     d->m_categoriesMap.remove(categoryLabel);
                     // the range of the interval that follows (if exists) needs to be updated
                     if (labelIndex < d->m_categories.count()) {
                         QString label = d->m_categories.at(labelIndex);
                         Range range = d->m_categoriesMap.value(label);
                         // set the range
                         if (labelIndex == 0) {
                             range.first = d->m_categoryMinimum;
                             d->m_categoriesMap.insert(label, range);
                         } else {
                             range.first = d->m_categoriesMap.value(d->m_categories.at(labelIndex - 1)).second;
                             d->m_categoriesMap.insert(label, range);
                         }
                     }
                     emit categoriesChanged();
                 }
             }
             /*!
               \qmlmethod CategoryAxis::replace(string oldLabel, string newLabel)
               Replaces \a oldLabel of an existing category with a \a newLabel.
               If the old label does not exist the method returns without making any changes.
             */
             /*!
               Replaces \a oldLabel of an existing category with a \a newLabel
               If the old label does not exist the method returns without making any changes.
              */
             void QCategoryAxis::replaceLabel(const QString &oldLabel, const QString &newLabel)
             {
                 Q_D(QCategoryAxis);
                 int labelIndex = d->m_categories.indexOf(oldLabel);
                 // check if such label exists
                 if (labelIndex != -1) {
                     d->m_categories.replace(labelIndex, newLabel);
                     Range range = d->m_categoriesMap.value(oldLabel);
                     d->m_categoriesMap.remove(oldLabel);
                     d->m_categoriesMap.insert(newLabel, range);
                     emit categoriesChanged();
                 }
             }
             /*!
               Returns the list of the intervals labels
              */
             QStringList QCategoryAxis::categoriesLabels()
             {
                 Q_D(QCategoryAxis);
                 return d->m_categories;
             }
             /*!
               Returns number of intervals.
              */
             int QCategoryAxis::count() const
             {
                 Q_D(const QCategoryAxis);
                 return d->m_categories.count();
             }
             /*!
               Returns the type of the axis
             */
             QAbstractAxis::AxisType QCategoryAxis::type() const
             {
                 return QAbstractAxis::AxisTypeCategory;
             }
+            void QCategoryAxis::setLabelsPosition(QCategoryAxis::AxisLabelsPosition position)
+            {
+                Q_D(QCategoryAxis);
+                if (d->m_labelsPosition != position) {
+                    d->m_labelsPosition = position;
+                    emit labelsPositionChanged(position);
+                }
+            }
+            QCategoryAxis::AxisLabelsPosition QCategoryAxis::labelsPosition() const
+            {
+                Q_D(const QCategoryAxis);
+                return d->m_labelsPosition;
+            }
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QCategoryAxisPrivate::QCategoryAxisPrivate(QCategoryAxis *q)
                 : QValueAxisPrivate(q),
-                  m_categoryMinimum(0)
+                  m_categoryMinimum(0),
+                  m_labelsPosition(QCategoryAxis::AxisLabelsPositionCenter)
             {
             }
             QCategoryAxisPrivate::~QCategoryAxisPrivate()
             {
             }
             int QCategoryAxisPrivate::ticksCount() const
             {
                 return m_categories.count() + 1;
             }
             void QCategoryAxisPrivate::initializeGraphics(QGraphicsItem *parent)
             {
                 Q_Q(QCategoryAxis);
                 ChartAxisElement *axis(0);
                 if (m_chart->chartType() == QChart::ChartTypeCartesian) {
                     if (orientation() == Qt::Vertical)
                         axis = new ChartCategoryAxisY(q,parent);
                     else if (orientation() == Qt::Horizontal)
                         axis = new ChartCategoryAxisX(q,parent);
                 }
                 if (m_chart->chartType() == QChart::ChartTypePolar) {
                     if (orientation() == Qt::Vertical)
                         axis = new PolarChartCategoryAxisRadial(q, parent);
                     if (orientation() == Qt::Horizontal)
                         axis = new PolarChartCategoryAxisAngular(q, parent);
                 }
                 m_item.reset(axis);
                 QAbstractAxisPrivate::initializeGraphics(parent);
             }
             #include "moc_qcategoryaxis.cpp"
             #include "moc_qcategoryaxis_p.cpp"
             QT_CHARTS_END_NAMESPACE

src/charts/axis/categoryaxis/qcategoryaxis.h +12 0

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #ifndef QCATEGORYAXIS_H
             #define QCATEGORYAXIS_H
             #include <QtCharts/QAbstractAxis>
             #include <QtCharts/QValueAxis>
             QT_CHARTS_BEGIN_NAMESPACE
             class QCategoryAxisPrivate;
             class QT_CHARTS_EXPORT QCategoryAxis : public QValueAxis
             {
                 Q_OBJECT
                 Q_PROPERTY(qreal startValue READ startValue WRITE setStartValue)
                 Q_PROPERTY(int count READ count)
                 Q_PROPERTY(QStringList categoriesLabels READ categoriesLabels)
+                Q_PROPERTY(AxisLabelsPosition labelsPosition READ labelsPosition WRITE setLabelsPosition NOTIFY labelsPositionChanged)
+                Q_ENUMS(AxisLabelsPosition)
             public:
+                enum AxisLabelsPosition {
+                    AxisLabelsPositionCenter = 0x0,
+                    AxisLabelsPositionOnValue = 0x1
+                };
                 explicit QCategoryAxis(QObject *parent = 0);
                 ~QCategoryAxis();
             protected:
                 QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent = 0);
             public:
                 AxisType type() const;
                 void append(const QString &label, qreal categoryEndValue);
                 void remove(const QString &label);
                 void replaceLabel(const QString &oldLabel, const QString &newLabel);
                 qreal startValue(const QString &categoryLabel = QString()) const;
                 void setStartValue(qreal min);
                 qreal endValue(const QString &categoryLabel) const;
                 QStringList categoriesLabels();
                 int count() const;
+                QCategoryAxis::AxisLabelsPosition labelsPosition() const;
+                void setLabelsPosition(QCategoryAxis::AxisLabelsPosition position);
             Q_SIGNALS:
                 void categoriesChanged();
+                void labelsPositionChanged(QCategoryAxis::AxisLabelsPosition position);
             private:
                 Q_DECLARE_PRIVATE(QCategoryAxis)
                 Q_DISABLE_COPY(QCategoryAxis)
             };
             QT_CHARTS_END_NAMESPACE
             #endif // QCATEGORYAXIS_H

src/charts/axis/categoryaxis/qcategoryaxis_p.h +1 0

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the Qt Enterprise 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 QCATEGORYAXIS_P_H
             #define QCATEGORYAXIS_P_H
             #include <QtCharts/QCategoryAxis>
             #include <private/qvalueaxis_p.h>
             QT_CHARTS_BEGIN_NAMESPACE
             typedef QPair<qreal, qreal> Range;
             class QCategoryAxisPrivate : public QValueAxisPrivate
             {
                 Q_OBJECT
             public:
                 QCategoryAxisPrivate(QCategoryAxis *q);
                 ~QCategoryAxisPrivate();
                 void initializeGraphics(QGraphicsItem* parent);
                 int ticksCount() const;
             private:
                 QMap<QString , Range> m_categoriesMap;
                 QStringList m_categories;
                 qreal m_categoryMinimum;
+                QCategoryAxis::AxisLabelsPosition m_labelsPosition;
             private:
                 Q_DECLARE_PUBLIC(QCategoryAxis)
             };
             QT_CHARTS_END_NAMESPACE
             #endif // QCATEGORYAXIS_P_H

src/charts/axis/horizontalaxis.cpp +17 0

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #include <private/horizontalaxis_p.h>
             #include <private/qabstractaxis_p.h>
             #include <private/chartpresenter_p.h>
+            #include <QtCharts/QCategoryAxis>
             #include <QtCore/QtMath>
             #include <QtCore/QDebug>
             QT_CHARTS_BEGIN_NAMESPACE
             HorizontalAxis::HorizontalAxis(QAbstractAxis *axis, QGraphicsItem *item, bool intervalAxis)
                 : CartesianChartAxis(axis, item, intervalAxis)
             {
             }
             HorizontalAxis::~HorizontalAxis()
             {
             }
             void HorizontalAxis::updateGeometry()
             {
                 const QVector<qreal> &layout = ChartAxisElement::layout();
                 if (layout.isEmpty() && axis()->type() != QAbstractAxis::AxisTypeLogValue)
                     return;
                 QStringList labelList = labels();
                 QList<QGraphicsItem *> labels = labelItems();
                 QList<QGraphicsItem *> arrow = arrowItems();
                 QGraphicsTextItem *title = titleItem();
                 Q_ASSERT(labels.size() == labelList.size());
                 Q_ASSERT(layout.size() == labelList.size());
                 const QRectF &axisRect = axisGeometry();
                 const QRectF &gridRect = gridGeometry();
                 //arrow
                 QGraphicsLineItem *arrowItem = static_cast<QGraphicsLineItem *>(arrow.at(0));
                 if (axis()->alignment() == Qt::AlignTop)
                     arrowItem->setLine(gridRect.left(), axisRect.bottom(), gridRect.right(), axisRect.bottom());
                 else if (axis()->alignment() == Qt::AlignBottom)
                     arrowItem->setLine(gridRect.left(), axisRect.top(), gridRect.right(), axisRect.top());
                 qreal width = 0;
                 const QLatin1String ellipsis("...");
                 //title
                 QRectF titleBoundingRect;
                 QString titleText = axis()->titleText();
                 qreal availableSpace = axisRect.height() - labelPadding();
                 if (!titleText.isEmpty() && titleItem()->isVisible()) {
                     availableSpace -= titlePadding() * 2.0;
                     qreal minimumLabelHeight = ChartPresenter::textBoundingRect(axis()->labelsFont(),
                                                                                 QStringLiteral("...")).height();
                     qreal titleSpace = availableSpace - minimumLabelHeight;
                     title->setHtml(ChartPresenter::truncatedText(axis()->titleFont(), titleText, qreal(0.0),
                                                                  gridRect.width(), titleSpace,
                                                                  titleBoundingRect));
                     title->setTextWidth(titleBoundingRect.width());
                     titleBoundingRect = title->boundingRect();
                     QPointF center = gridRect.center() - titleBoundingRect.center();
                     if (axis()->alignment() == Qt::AlignTop)
                         title->setPos(center.x(), axisRect.top() + titlePadding());
                     else  if (axis()->alignment() == Qt::AlignBottom)
                         title->setPos(center.x(), axisRect.bottom() - titleBoundingRect.height() - titlePadding());
                     availableSpace -= titleBoundingRect.height();
                 }
                 if (layout.isEmpty() && axis()->type() == QAbstractAxis::AxisTypeLogValue)
                     return;
                 QList<QGraphicsItem *> lines = gridItems();
                 QList<QGraphicsItem *> shades = shadeItems();
                 for (int i = 0; i < layout.size(); ++i) {
                     //items
                     QGraphicsLineItem *gridItem = static_cast<QGraphicsLineItem*>(lines.at(i));
                     QGraphicsLineItem *tickItem = static_cast<QGraphicsLineItem*>(arrow.at(i + 1));
                     QGraphicsTextItem *labelItem = static_cast<QGraphicsTextItem *>(labels.at(i));
                     //grid line
                     gridItem->setLine(layout[i], gridRect.top(), layout[i], gridRect.bottom());
                     //label text wrapping
                     QString text = labelList.at(i);
                     QRectF boundingRect;
                     // don't truncate empty labels
                     if (text.isEmpty()) {
                         labelItem->setHtml(text);
                     } else  {
                         qreal labelWidth = axisRect.width() / layout.count() - (2 * labelPadding());
                         QString truncatedText = ChartPresenter::truncatedText(axis()->labelsFont(), text,
                                                                               axis()->labelsAngle(),
                                                                               labelWidth,
                                                                               availableSpace, boundingRect);
                         labelItem->setTextWidth(ChartPresenter::textBoundingRect(axis()->labelsFont(),
                                                                                  truncatedText).width());
                         labelItem->setHtml(truncatedText);
                     }
                     //label transformation origin point
                     const QRectF& rect = labelItem->boundingRect();
                     QPointF center = rect.center();
                     labelItem->setTransformOriginPoint(center.x(), center.y());
                     qreal heightDiff = rect.height() - boundingRect.height();
                     qreal widthDiff = rect.width() - boundingRect.width();
                     //ticks and label position
                     if (axis()->alignment() == Qt::AlignTop) {
                         labelItem->setPos(layout[i] - center.x(), axisRect.bottom() - rect.height() + (heightDiff / 2.0) - labelPadding());
                         tickItem->setLine(layout[i], axisRect.bottom(), layout[i], axisRect.bottom() - labelPadding());
                     } else if (axis()->alignment() == Qt::AlignBottom) {
                         labelItem->setPos(layout[i] - center.x(), axisRect.top() - (heightDiff / 2.0) + labelPadding());
                         tickItem->setLine(layout[i], axisRect.top(), layout[i], axisRect.top() + labelPadding());
                     }
                     //label in between
                     bool forceHide = false;
                     if (intervalAxis() && (i + 1) != layout.size()) {
                         qreal leftBound = qMax(layout[i], gridRect.left());
                         qreal rightBound = qMin(layout[i + 1], gridRect.right());
                         const qreal delta = rightBound - leftBound;
+                        if (axis()->type() != QAbstractAxis::AxisTypeCategory) {
                             // Hide label in case visible part of the category at the grid edge is too narrow
                             if (delta < boundingRect.width()
                                 && (leftBound == gridRect.left() || rightBound == gridRect.right())) {
                                 forceHide = true;
                             } else {
                                 labelItem->setPos(leftBound + (delta / 2.0) - center.x(), labelItem->pos().y());
                             }
+                        } else {
+                            QCategoryAxis *categoryAxis = static_cast<QCategoryAxis *>(axis());
+                            if (categoryAxis->labelsPosition() == QCategoryAxis::AxisLabelsPositionCenter) {
+                                if (delta < boundingRect.width()
+                                    && (leftBound == gridRect.left() || rightBound == gridRect.right())) {
+                                    forceHide = true;
+                                } else {
+                                    labelItem->setPos(leftBound + (delta / 2.0) - center.x(),
+                                                      labelItem->pos().y());
+                                }
+                            } else if (categoryAxis->labelsPosition()
+                                       == QCategoryAxis::AxisLabelsPositionOnValue) {
+                                labelItem->setPos(rightBound - center.x(), labelItem->pos().y());
+                            }
+                        }
                     }
                     //label overlap detection - compensate one pixel for rounding errors
                     if ((labelItem->pos().x() < width && labelItem->toPlainText() == ellipsis) || forceHide ||
                         (labelItem->pos().x() + (widthDiff / 2.0)) < (axisRect.left() - 1.0) ||
                         (labelItem->pos().x() + (widthDiff / 2.0) - 1.0) > axisRect.right()) {
                         labelItem->setVisible(false);
                     } else {
                         labelItem->setVisible(true);
                         width = boundingRect.width() + labelItem->pos().x();
                     }
                     //shades
                     QGraphicsRectItem *shadeItem = 0;
                     if (i == 0)
                         shadeItem = static_cast<QGraphicsRectItem *>(shades.at(0));
                     else if (i % 2)
                         shadeItem = static_cast<QGraphicsRectItem *>(shades.at((i / 2) + 1));
                     if (shadeItem) {
                         qreal leftBound;
                         qreal rightBound;
                         if (i == 0) {
                             leftBound = gridRect.left();
                             rightBound = layout[0];
                         } else {
                             leftBound = layout[i];
                             if (i == layout.size() - 1)
                                 rightBound = gridRect.right();
                             else
                                 rightBound = qMin(layout[i + 1], gridRect.right());
                         }
                         if (leftBound < gridRect.left())
                             leftBound = gridRect.left();
                         if (rightBound > gridRect.right())
                             rightBound = gridRect.right();
                         shadeItem->setRect(leftBound, gridRect.top(), rightBound - leftBound,
                                            gridRect.height());
                         if (shadeItem->rect().width() <= 0.0)
                             shadeItem->setVisible(false);
                         else
                             shadeItem->setVisible(true);
                     }
                     // check if the grid line and the axis tick should be shown
                     qreal x = gridItem->line().p1().x();
                     if (x < gridRect.left() || x > gridRect.right()) {
                         gridItem->setVisible(false);
                         tickItem->setVisible(false);
                     } else {
                         gridItem->setVisible(true);
                         tickItem->setVisible(true);
                     }
                 }
                 //begin/end grid line in case labels between
                 if (intervalAxis()) {
                     QGraphicsLineItem *gridLine;
                     gridLine = static_cast<QGraphicsLineItem *>(lines.at(layout.size()));
                     gridLine->setLine(gridRect.right(), gridRect.top(), gridRect.right(), gridRect.bottom());
                     gridLine->setVisible(true);
                     gridLine = static_cast<QGraphicsLineItem*>(lines.at(layout.size()+1));
                     gridLine->setLine(gridRect.left(), gridRect.top(), gridRect.left(), gridRect.bottom());
                     gridLine->setVisible(true);
                 }
             }
             QSizeF HorizontalAxis::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint);
                 QSizeF sh(0,0);
                 if (axis()->titleText().isEmpty() || !titleItem()->isVisible())
                     return sh;
                 switch (which) {
                 case Qt::MinimumSize: {
                     QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(),
                                                                         QStringLiteral("..."));
                     sh = QSizeF(titleRect.width(), titleRect.height() + (titlePadding() * 2.0));
                     break;
                 }
                 case Qt::MaximumSize:
                 case Qt::PreferredSize: {
                     QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), axis()->titleText());
                     sh = QSizeF(titleRect.width(), titleRect.height() + (titlePadding() * 2.0));
                     break;
                 }
                 default:
                     break;
                 }
                 return sh;
             }
             QT_CHARTS_END_NAMESPACE

src/charts/axis/verticalaxis.cpp +24 -3

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #include <private/verticalaxis_p.h>
             #include <QtCharts/QAbstractAxis>
             #include <private/chartpresenter_p.h>
+            #include <QtCharts/QCategoryAxis>
             #include <QtCore/QDebug>
             QT_CHARTS_BEGIN_NAMESPACE
             VerticalAxis::VerticalAxis(QAbstractAxis *axis, QGraphicsItem *item, bool intervalAxis)
                 : CartesianChartAxis(axis, item, intervalAxis)
             {
             }
             VerticalAxis::~VerticalAxis()
             {
             }
             void VerticalAxis::updateGeometry()
             {
                 const QVector<qreal> &layout = ChartAxisElement::layout();
                 if (layout.isEmpty() && axis()->type() != QAbstractAxis::AxisTypeLogValue)
                     return;
                 QStringList labelList = labels();
                 QList<QGraphicsItem *> labels = labelItems();
                 QList<QGraphicsItem *> arrow = arrowItems();
                 QGraphicsTextItem *title = titleItem();
                 Q_ASSERT(labels.size() == labelList.size());
                 Q_ASSERT(layout.size() == labelList.size());
                 const QRectF &axisRect = axisGeometry();
                 const QRectF &gridRect = gridGeometry();
                 qreal height = axisRect.bottom();
                 //arrow
                 QGraphicsLineItem *arrowItem = static_cast<QGraphicsLineItem*>(arrow.at(0));
                 //arrow position
                 if (axis()->alignment() == Qt::AlignLeft)
                     arrowItem->setLine(axisRect.right(), gridRect.top(), axisRect.right(), gridRect.bottom());
                 else if (axis()->alignment() == Qt::AlignRight)
                     arrowItem->setLine(axisRect.left(), gridRect.top(), axisRect.left(), gridRect.bottom());
                 //title
                 QRectF titleBoundingRect;
                 QString titleText = axis()->titleText();
                 qreal availableSpace = axisRect.width() - labelPadding();
                 if (!titleText.isEmpty() && titleItem()->isVisible()) {
                     availableSpace -= titlePadding() * 2.0;
                     qreal minimumLabelWidth = ChartPresenter::textBoundingRect(axis()->labelsFont(),
                                                                                QStringLiteral("...")).width();
                     qreal titleSpace = availableSpace - minimumLabelWidth;
                     title->setHtml(ChartPresenter::truncatedText(axis()->titleFont(), titleText, qreal(90.0),
                                                                  titleSpace, gridRect.height(),
                                                                  titleBoundingRect));
                     title->setTextWidth(titleBoundingRect.height());
                     titleBoundingRect = title->boundingRect();
                     QPointF center = gridRect.center() - titleBoundingRect.center();
                     if (axis()->alignment() == Qt::AlignLeft)
                         title->setPos(axisRect.left() - titleBoundingRect.width() / 2.0 + titleBoundingRect.height() / 2.0 + titlePadding(), center.y());
                     else if (axis()->alignment() == Qt::AlignRight)
                         title->setPos(axisRect.right() - titleBoundingRect.width() / 2.0 - titleBoundingRect.height() / 2.0 - titlePadding(), center.y());
                     title->setTransformOriginPoint(titleBoundingRect.center());
                     title->setRotation(270);
                     availableSpace -= titleBoundingRect.height();
                 }
                 if (layout.isEmpty() && axis()->type() == QAbstractAxis::AxisTypeLogValue)
                     return;
                 QList<QGraphicsItem *> lines = gridItems();
                 QList<QGraphicsItem *> shades = shadeItems();
                 for (int i = 0; i < layout.size(); ++i) {
                     //items
                     QGraphicsLineItem *gridItem = static_cast<QGraphicsLineItem *>(lines.at(i));
                     QGraphicsLineItem *tickItem = static_cast<QGraphicsLineItem *>(arrow.at(i + 1));
                     QGraphicsTextItem *labelItem = static_cast<QGraphicsTextItem *>(labels.at(i));
                     //grid line
                     gridItem->setLine(gridRect.left(), layout[i], gridRect.right(), layout[i]);
                     //label text wrapping
                     QString text = labelList.at(i);
                     QRectF boundingRect;
                     // don't truncate empty labels
                     if (text.isEmpty()) {
                         labelItem->setHtml(text);
                     } else {
                         qreal labelHeight = (axisRect.height() / layout.count()) - (2 * labelPadding());
                         QString truncatedText = ChartPresenter::truncatedText(axis()->labelsFont(), text,
                                                                               axis()->labelsAngle(),
                                                                               availableSpace,
                                                                               labelHeight, boundingRect);
                         labelItem->setTextWidth(ChartPresenter::textBoundingRect(axis()->labelsFont(),
                                                                                  truncatedText).width());
                         labelItem->setHtml(truncatedText);
                     }
                     //label transformation origin point
                     const QRectF &rect = labelItem->boundingRect();
                     QPointF center = rect.center();
                     labelItem->setTransformOriginPoint(center.x(), center.y());
                     qreal widthDiff = rect.width() - boundingRect.width();
                     qreal heightDiff = rect.height() - boundingRect.height();
                     //ticks and label position
                     if (axis()->alignment() == Qt::AlignLeft) {
                         labelItem->setPos(axisRect.right() - rect.width() + (widthDiff / 2.0) - labelPadding(), layout[i] - center.y());
                         tickItem->setLine(axisRect.right() - labelPadding(), layout[i], axisRect.right(), layout[i]);
                     } else if (axis()->alignment() == Qt::AlignRight) {
                         labelItem->setPos(axisRect.left() + labelPadding() - (widthDiff / 2.0), layout[i] - center.y());
                         tickItem->setLine(axisRect.left(), layout[i], axisRect.left() + labelPadding(), layout[i]);
                     }
                     //label in between
                     bool forceHide = false;
+                    bool labelOnValue = false;
                     if (intervalAxis() && (i + 1) != layout.size()) {
                         qreal lowerBound = qMin(layout[i], gridRect.bottom());
                         qreal upperBound = qMax(layout[i + 1], gridRect.top());
                         const qreal delta = lowerBound - upperBound;
+                        if (axis()->type() != QAbstractAxis::AxisTypeCategory) {
                             // Hide label in case visible part of the category at the grid edge is too narrow
                             if (delta < boundingRect.height()
                                 && (lowerBound == gridRect.bottom() || upperBound == gridRect.top())) {
                                 forceHide = true;
                             } else {
-                            labelItem->setPos(labelItem->pos().x() , lowerBound - (delta / 2.0) - center.y());
+                                labelItem->setPos(labelItem->pos().x(),
+                                                  lowerBound - (delta / 2.0) - center.y());
+                            }
+                        } else {
+                            QCategoryAxis *categoryAxis = static_cast<QCategoryAxis *>(axis());
+                            if (categoryAxis->labelsPosition() == QCategoryAxis::AxisLabelsPositionCenter) {
+                                if (delta < boundingRect.height()
+                                    && (lowerBound == gridRect.bottom() || upperBound == gridRect.top())) {
+                                    forceHide = true;
+                                } else {
+                                    labelItem->setPos(labelItem->pos().x(),
+                                                      lowerBound - (delta / 2.0) - center.y());
+                                }
+                            } else if (categoryAxis->labelsPosition()
+                                       == QCategoryAxis::AxisLabelsPositionOnValue) {
+                                labelOnValue = true;
+                                labelItem->setPos(labelItem->pos().x(), upperBound - center.y());
+                            }
                         }
                     }
                     //label overlap detection - compensate one pixel for rounding errors
                     if (labelItem->pos().y() + boundingRect.height() > height || forceHide ||
-                        (labelItem->pos().y() + (heightDiff / 2.0) - 1.0) > axisRect.bottom() ||
+                        ((labelItem->pos().y() + (heightDiff / 2.0) - 1.0) > axisRect.bottom()
-                        labelItem->pos().y() + (heightDiff / 2.0) < (axisRect.top() - 1.0)) {
+                         && !labelOnValue) ||
+                        (labelItem->pos().y() + (heightDiff / 2.0) < (axisRect.top() - 1.0) && !labelOnValue)) {
                         labelItem->setVisible(false);
                     }
                     else {
                         labelItem->setVisible(true);
                         height=labelItem->pos().y();
                     }
                     //shades
                     QGraphicsRectItem *shadeItem = 0;
                     if (i == 0)
                         shadeItem = static_cast<QGraphicsRectItem *>(shades.at(0));
                     else if (i % 2)
                         shadeItem = static_cast<QGraphicsRectItem *>(shades.at((i / 2) + 1));
                     if (shadeItem) {
                         qreal lowerBound;
                         qreal upperBound;
                         if (i == 0) {
                             lowerBound = gridRect.bottom();
                             upperBound = layout[0];
                         } else {
                             lowerBound = layout[i];
                             if (i == layout.size() - 1)
                                 upperBound = gridRect.top();
                             else
                                 upperBound = qMax(layout[i + 1], gridRect.top());
                         }
                         if (lowerBound > gridRect.bottom())
                             lowerBound = gridRect.bottom();
                         if (upperBound < gridRect.top())
                             upperBound = gridRect.top();
                         shadeItem->setRect(gridRect.left(), upperBound, gridRect.width(),
                                            lowerBound - upperBound);
                         if (shadeItem->rect().height() <= 0.0)
                             shadeItem->setVisible(false);
                         else
                             shadeItem->setVisible(true);
                     }
                     // check if the grid line and the axis tick should be shown
                     qreal y = gridItem->line().p1().y();
                     if ((y < gridRect.top() || y > gridRect.bottom()))
                     {
                         gridItem->setVisible(false);
                         tickItem->setVisible(false);
                     }else{
                         gridItem->setVisible(true);
                         tickItem->setVisible(true);
                     }
                 }
                 //begin/end grid line in case labels between
                 if (intervalAxis()) {
                     QGraphicsLineItem *gridLine;
                     gridLine = static_cast<QGraphicsLineItem *>(lines.at(layout.size()));
                     gridLine->setLine(gridRect.left(), gridRect.top(), gridRect.right(), gridRect.top());
                     gridLine->setVisible(true);
                     gridLine = static_cast<QGraphicsLineItem*>(lines.at(layout.size() + 1));
                     gridLine->setLine(gridRect.left(), gridRect.bottom(), gridRect.right(), gridRect.bottom());
                     gridLine->setVisible(true);
                 }
             }
             QSizeF VerticalAxis::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint);
                 QSizeF sh(0, 0);
                 if (axis()->titleText().isEmpty() || !titleItem()->isVisible())
                     return sh;
                 switch (which) {
                 case Qt::MinimumSize: {
                     QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(),
                                                                         QStringLiteral("..."));
                     sh = QSizeF(titleRect.height() + (titlePadding() * 2.0), titleRect.width());
                     break;
                 }
                 case Qt::MaximumSize:
                 case Qt::PreferredSize: {
                     QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), axis()->titleText());
                     sh = QSizeF(titleRect.height() + (titlePadding() * 2.0), titleRect.width());
                     break;
                 }
                 default:
                     break;
                 }
                 return sh;
             }
             QT_CHARTS_END_NAMESPACE

src/chartsqml2/chartsqml2_plugin.cpp +4 0

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #include <QtCharts/QChart>
             #include <QtCharts/QAbstractAxis>
             #include <QtCharts/QValueAxis>
             #include <QtCharts/QLogValueAxis>
             #include "declarativecategoryaxis.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 "declarativepieseries.h"
             #include "declarativeaxes.h"
             #include <QtCharts/QVXYModelMapper>
             #include <QtCharts/QHXYModelMapper>
             #include <QtCharts/QHPieModelMapper>
             #include <QtCharts/QVPieModelMapper>
             #include <QtCharts/QHBarModelMapper>
             #include <QtCharts/QVBarModelMapper>
             #include "declarativemargins.h"
             #include <QtCharts/QAreaLegendMarker>
             #include <QtCharts/QBarLegendMarker>
             #include <QtCharts/QPieLegendMarker>
             #include <QtCharts/QXYLegendMarker>
             #include <QtCharts/QBoxPlotModelMapper>
             #include <QtCharts/QVBoxPlotModelMapper>
             #ifndef QT_ON_ARM
                 #include <QtCharts/QDateTimeAxis>
             #endif
             #include <QtCore/QAbstractItemModel>
             #include <QtQml>
             QT_CHARTS_USE_NAMESPACE
             QML_DECLARE_TYPE(QList<QPieSlice *>)
             QML_DECLARE_TYPE(QList<QBarSet *>)
             QML_DECLARE_TYPE(QList<QAbstractAxis *>)
             QML_DECLARE_TYPE(DeclarativeChart)
             QML_DECLARE_TYPE(DeclarativePolarChart)
             QML_DECLARE_TYPE(DeclarativeMargins)
             QML_DECLARE_TYPE(DeclarativeAreaSeries)
             QML_DECLARE_TYPE(DeclarativeBarSeries)
             QML_DECLARE_TYPE(DeclarativeBarSet)
             QML_DECLARE_TYPE(DeclarativeBoxPlotSeries)
             QML_DECLARE_TYPE(DeclarativeBoxSet)
             QML_DECLARE_TYPE(DeclarativeLineSeries)
             QML_DECLARE_TYPE(DeclarativePieSeries)
             QML_DECLARE_TYPE(DeclarativePieSlice)
             QML_DECLARE_TYPE(DeclarativeScatterSeries)
             QML_DECLARE_TYPE(DeclarativeSplineSeries)
             QML_DECLARE_TYPE(QAbstractAxis)
             QML_DECLARE_TYPE(QValueAxis)
             QML_DECLARE_TYPE(QBarCategoryAxis)
             QML_DECLARE_TYPE(QCategoryAxis)
             QML_DECLARE_TYPE(QDateTimeAxis)
             QML_DECLARE_TYPE(QLogValueAxis)
             QML_DECLARE_TYPE(QLegend)
             QML_DECLARE_TYPE(QLegendMarker)
             QML_DECLARE_TYPE(QAreaLegendMarker)
             QML_DECLARE_TYPE(QBarLegendMarker)
             QML_DECLARE_TYPE(QPieLegendMarker)
             QML_DECLARE_TYPE(QHPieModelMapper)
             QML_DECLARE_TYPE(QHXYModelMapper)
             QML_DECLARE_TYPE(QPieModelMapper)
             QML_DECLARE_TYPE(QHBarModelMapper)
             QML_DECLARE_TYPE(QBarModelMapper)
             QML_DECLARE_TYPE(QVBarModelMapper)
             QML_DECLARE_TYPE(QVPieModelMapper)
             QML_DECLARE_TYPE(QVXYModelMapper)
             QML_DECLARE_TYPE(QXYLegendMarker)
             QML_DECLARE_TYPE(QXYModelMapper)
             QML_DECLARE_TYPE(QBoxPlotModelMapper)
             QML_DECLARE_TYPE(QVBoxPlotModelMapper)
             QML_DECLARE_TYPE(QAbstractSeries)
             QML_DECLARE_TYPE(QXYSeries)
             QML_DECLARE_TYPE(QAbstractBarSeries)
             QML_DECLARE_TYPE(QBarSeries)
             QML_DECLARE_TYPE(QBarSet)
             QML_DECLARE_TYPE(QAreaSeries)
             QML_DECLARE_TYPE(QHorizontalBarSeries)
             QML_DECLARE_TYPE(QHorizontalPercentBarSeries)
             QML_DECLARE_TYPE(QHorizontalStackedBarSeries)
             QML_DECLARE_TYPE(QLineSeries)
             QML_DECLARE_TYPE(QPercentBarSeries)
             QML_DECLARE_TYPE(QPieSeries)
             QML_DECLARE_TYPE(QPieSlice)
             QML_DECLARE_TYPE(QScatterSeries)
             QML_DECLARE_TYPE(QSplineSeries)
             QML_DECLARE_TYPE(QStackedBarSeries)
             QT_CHARTS_BEGIN_NAMESPACE
             class QtChartsQml2Plugin : public QQmlExtensionPlugin
             {
                 Q_OBJECT
                 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
             public:
                 virtual void registerTypes(const char *uri)
                 {
                     Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCharts"));
                     // @uri QtCharts
                     qRegisterMetaType<QList<QPieSlice *> >();
                     qRegisterMetaType<QList<QBarSet *> >();
                     qRegisterMetaType<QList<QAbstractAxis *> >();
                     // QtCharts 1.0
                     qmlRegisterType<DeclarativeChart>(uri, 1, 0, "ChartView");
                     qmlRegisterType<DeclarativeXYPoint>(uri, 1, 0, "XYPoint");
                     qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries");
                     qmlRegisterType<DeclarativeSplineSeries>(uri, 1, 0, "SplineSeries");
                     qmlRegisterType<DeclarativeAreaSeries>(uri, 1, 0, "AreaSeries");
                     qmlRegisterType<DeclarativeBarSeries>(uri, 1, 0, "BarSeries");
                     qmlRegisterType<DeclarativeStackedBarSeries>(uri, 1, 0, "StackedBarSeries");
                     qmlRegisterType<DeclarativePercentBarSeries>(uri, 1, 0, "PercentBarSeries");
                     qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
                     qmlRegisterType<QPieSlice>(uri, 1, 0, "PieSlice");
                     qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");
                     qmlRegisterType<QHXYModelMapper>(uri, 1, 0, "HXYModelMapper");
                     qmlRegisterType<QVXYModelMapper>(uri, 1, 0, "VXYModelMapper");
                     qmlRegisterType<QHPieModelMapper>(uri, 1, 0, "HPieModelMapper");
                     qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper");
                     qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper");
                     qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper");
                     qmlRegisterType<QValueAxis>(uri, 1, 0, "ValuesAxis");
                     qmlRegisterType<QBarCategoryAxis>(uri, 1, 0, "BarCategoriesAxis");
                     qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
                                                         QLatin1String("Trying to create uncreatable: Legend."));
                     qmlRegisterUncreatableType<QXYSeries>(uri, 1, 0, "XYSeries",
                                                           QLatin1String("Trying to create uncreatable: XYSeries."));
                     qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
                                                                    QLatin1String("Trying to create uncreatable: AbstractItemModel."));
                     qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
                                                                QLatin1String("Trying to create uncreatable: XYModelMapper."));
                     qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: PieModelMapper."));
                     qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 0, "BarModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: BarModelMapper."));
                     qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 0, "AbstractSeries",
                                                                 QLatin1String("Trying to create uncreatable: AbstractSeries."));
                     qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 1, 0, "AbstractBarSeries",
                                                                    QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
                     qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis",
                                                               QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));
                     qmlRegisterUncreatableType<QBarSet>(uri, 1, 0, "BarSetBase",
                                                         QLatin1String("Trying to create uncreatable: BarsetBase."));
                     qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries",
                                                            QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead."));
                     qmlRegisterUncreatableType<DeclarativeAxes>(uri, 1, 0, "DeclarativeAxes",
                                                            QLatin1String("Trying to create uncreatable: DeclarativeAxes."));
                     // QtCharts 1.1
                     qmlRegisterType<DeclarativeChart, 1>(uri, 1, 1, "ChartView");
                     qmlRegisterType<DeclarativeScatterSeries, 1>(uri, 1, 1, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries, 1>(uri, 1, 1, "LineSeries");
                     qmlRegisterType<DeclarativeSplineSeries, 1>(uri, 1, 1, "SplineSeries");
                     qmlRegisterType<DeclarativeAreaSeries, 1>(uri, 1, 1, "AreaSeries");
                     qmlRegisterType<DeclarativeBarSeries, 1>(uri, 1, 1, "BarSeries");
                     qmlRegisterType<DeclarativeStackedBarSeries, 1>(uri, 1, 1, "StackedBarSeries");
                     qmlRegisterType<DeclarativePercentBarSeries, 1>(uri, 1, 1, "PercentBarSeries");
                     qmlRegisterType<DeclarativeHorizontalBarSeries, 1>(uri, 1, 1, "HorizontalBarSeries");
                     qmlRegisterType<DeclarativeHorizontalStackedBarSeries, 1>(uri, 1, 1, "HorizontalStackedBarSeries");
                     qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 1>(uri, 1, 1, "HorizontalPercentBarSeries");
                     qmlRegisterType<DeclarativePieSeries>(uri, 1, 1, "PieSeries");
                     qmlRegisterType<DeclarativeBarSet>(uri, 1, 1, "BarSet");
                     qmlRegisterType<QValueAxis>(uri, 1, 1, "ValueAxis");
             #ifndef QT_ON_ARM
                     qmlRegisterType<QDateTimeAxis>(uri, 1, 1, "DateTimeAxis");
             #endif
                     qmlRegisterType<DeclarativeCategoryAxis>(uri, 1, 1, "CategoryAxis");
                     qmlRegisterType<DeclarativeCategoryRange>(uri, 1, 1, "CategoryRange");
                     qmlRegisterType<QBarCategoryAxis>(uri, 1, 1, "BarCategoryAxis");
                     qmlRegisterUncreatableType<DeclarativeMargins>(uri, 1, 1, "Margins",
                                                                    QLatin1String("Trying to create uncreatable: Margins."));
                     // QtCharts 1.2
                     qmlRegisterType<DeclarativeChart, 2>(uri, 1, 2, "ChartView");
                     qmlRegisterType<DeclarativeScatterSeries, 2>(uri, 1, 2, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries, 2>(uri, 1, 2, "LineSeries");
                     qmlRegisterType<DeclarativeSplineSeries, 2>(uri, 1, 2, "SplineSeries");
                     qmlRegisterType<DeclarativeAreaSeries, 2>(uri, 1, 2, "AreaSeries");
                     qmlRegisterType<DeclarativeBarSeries, 2>(uri, 1, 2, "BarSeries");
                     qmlRegisterType<DeclarativeStackedBarSeries, 2>(uri, 1, 2, "StackedBarSeries");
                     qmlRegisterType<DeclarativePercentBarSeries, 2>(uri, 1, 2, "PercentBarSeries");
                     qmlRegisterType<DeclarativeHorizontalBarSeries, 2>(uri, 1, 2, "HorizontalBarSeries");
                     qmlRegisterType<DeclarativeHorizontalStackedBarSeries, 2>(uri, 1, 2, "HorizontalStackedBarSeries");
                     qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 2>(uri, 1, 2, "HorizontalPercentBarSeries");
                     // QtCharts 1.3
                     qmlRegisterType<DeclarativeChart, 3>(uri, 1, 3, "ChartView");
                     qmlRegisterType<DeclarativePolarChart, 1>(uri, 1, 3, "PolarChartView");
                     qmlRegisterType<DeclarativeSplineSeries, 3>(uri, 1, 3, "SplineSeries");
                     qmlRegisterType<DeclarativeScatterSeries, 3>(uri, 1, 3, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries, 3>(uri, 1, 3, "LineSeries");
                     qmlRegisterType<DeclarativeAreaSeries, 3>(uri, 1, 3, "AreaSeries");
                     qmlRegisterType<QLogValueAxis>(uri, 1, 3, "LogValueAxis");
                     qmlRegisterType<DeclarativeBoxPlotSeries>(uri, 1, 3, "BoxPlotSeries");
                     qmlRegisterType<DeclarativeBoxSet>(uri, 1, 3, "BoxSet");
                     // QtCharts 1.4
                     qmlRegisterType<DeclarativeAreaSeries, 4>(uri, 1, 4, "AreaSeries");
                     qmlRegisterType<DeclarativeBarSet, 2>(uri, 1, 4, "BarSet");
                     qmlRegisterType<DeclarativeBoxPlotSeries, 1>(uri, 1, 4, "BoxPlotSeries");
                     qmlRegisterType<DeclarativeBoxSet, 1>(uri, 1, 4, "BoxSet");
                     qmlRegisterType<DeclarativePieSlice>(uri, 1, 4, "PieSlice");
                     qmlRegisterType<DeclarativeScatterSeries, 4>(uri, 1, 4, "ScatterSeries");
                     // QtCharts 2.0
                     qmlRegisterType<QVBoxPlotModelMapper>(uri, 2, 0, "VBoxPlotModelMapper");
                     qmlRegisterUncreatableType<QBoxPlotModelMapper>(uri, 2, 0, "BoxPlotModelMapper",
                         QLatin1String("Trying to create uncreatable: BoxPlotModelMapper."));
                     qmlRegisterType<DeclarativeChart, 4>(uri, 2, 0, "ChartView");
                     qmlRegisterType<DeclarativeXYPoint>(uri, 2, 0, "XYPoint");
                     qmlRegisterType<DeclarativeScatterSeries, 4>(uri, 2, 0, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries, 3>(uri, 2, 0, "LineSeries");
                     qmlRegisterType<DeclarativeSplineSeries, 3>(uri, 2, 0, "SplineSeries");
                     qmlRegisterType<DeclarativeAreaSeries, 4>(uri, 2, 0, "AreaSeries");
                     qmlRegisterType<DeclarativeBarSeries, 2>(uri, 2, 0, "BarSeries");
                     qmlRegisterType<DeclarativeStackedBarSeries, 2>(uri, 2, 0, "StackedBarSeries");
                     qmlRegisterType<DeclarativePercentBarSeries, 2>(uri, 2, 0, "PercentBarSeries");
                     qmlRegisterType<DeclarativePieSeries>(uri, 2, 0, "PieSeries");
                     qmlRegisterType<QPieSlice>(uri, 2, 0, "PieSlice");
                     qmlRegisterType<DeclarativeBarSet, 2>(uri, 2, 0, "BarSet");
                     qmlRegisterType<QHXYModelMapper>(uri, 2, 0, "HXYModelMapper");
                     qmlRegisterType<QVXYModelMapper>(uri, 2, 0, "VXYModelMapper");
                     qmlRegisterType<QHPieModelMapper>(uri, 2, 0, "HPieModelMapper");
                     qmlRegisterType<QVPieModelMapper>(uri, 2, 0, "VPieModelMapper");
                     qmlRegisterType<QHBarModelMapper>(uri, 2, 0, "HBarModelMapper");
                     qmlRegisterType<QVBarModelMapper>(uri, 2, 0, "VBarModelMapper");
                     qmlRegisterType<QValueAxis>(uri, 2, 0, "ValueAxis");
             #ifndef QT_ON_ARM
                     qmlRegisterType<QDateTimeAxis>(uri, 2, 0, "DateTimeAxis");
             #endif
                     qmlRegisterType<DeclarativeCategoryAxis>(uri, 2, 0, "CategoryAxis");
                     qmlRegisterType<DeclarativeCategoryRange>(uri, 2, 0, "CategoryRange");
                     qmlRegisterType<QBarCategoryAxis>(uri, 2, 0, "BarCategoryAxis");
                     qmlRegisterType<DeclarativePolarChart, 1>(uri, 2, 0, "PolarChartView");
                     qmlRegisterType<QLogValueAxis, 1>(uri, 2, 0, "LogValueAxis");
                     qmlRegisterType<DeclarativeBoxPlotSeries, 1>(uri, 2, 0, "BoxPlotSeries");
                     qmlRegisterType<DeclarativeBoxSet, 1>(uri, 2, 0, "BoxSet");
                     qmlRegisterType<DeclarativeHorizontalBarSeries, 2>(uri, 2, 0, "HorizontalBarSeries");
                     qmlRegisterType<DeclarativeHorizontalStackedBarSeries, 2>(uri, 2, 0, "HorizontalStackedBarSeries");
                     qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 2>(uri, 2, 0, "HorizontalPercentBarSeries");
                     qmlRegisterType<DeclarativePieSlice>(uri, 2, 0, "PieSlice");
                     qmlRegisterUncreatableType<QLegend>(uri, 2, 0, "Legend",
                                                         QLatin1String("Trying to create uncreatable: Legend."));
                     qmlRegisterUncreatableType<QXYSeries>(uri, 2, 0, "XYSeries",
                                                           QLatin1String("Trying to create uncreatable: XYSeries."));
                     qmlRegisterUncreatableType<QAbstractItemModel>(uri, 2, 0, "AbstractItemModel",
                                                                    QLatin1String("Trying to create uncreatable: AbstractItemModel."));
                     qmlRegisterUncreatableType<QXYModelMapper>(uri, 2, 0, "XYModelMapper",
                                                                QLatin1String("Trying to create uncreatable: XYModelMapper."));
                     qmlRegisterUncreatableType<QPieModelMapper>(uri, 2, 0, "PieModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: PieModelMapper."));
                     qmlRegisterUncreatableType<QBarModelMapper>(uri, 2, 0, "BarModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: BarModelMapper."));
                     qmlRegisterUncreatableType<QAbstractSeries>(uri, 2, 0, "AbstractSeries",
                                                                 QLatin1String("Trying to create uncreatable: AbstractSeries."));
                     qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 2, 0, "AbstractBarSeries",
                                                                    QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
                     qmlRegisterUncreatableType<QAbstractAxis>(uri, 2, 0, "AbstractAxis",
                                                               QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));
                     qmlRegisterUncreatableType<QBarSet>(uri, 2, 0, "BarSetBase",
                                                         QLatin1String("Trying to create uncreatable: BarsetBase."));
                     qmlRegisterUncreatableType<QPieSeries>(uri, 2, 0, "QPieSeries",
                                                            QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead."));
                     qmlRegisterUncreatableType<DeclarativeAxes>(uri, 2, 0, "DeclarativeAxes",
                                                                 QLatin1String("Trying to create uncreatable: DeclarativeAxes."));
                     qmlRegisterUncreatableType<DeclarativeMargins>(uri, 2, 0, "Margins",
                                                                    QLatin1String("Trying to create uncreatable: Margins."));
+                    // QtCharts 2.1
+                    qmlRegisterType<DeclarativeCategoryAxis, 1>(uri, 2, 1, "CategoryAxis");
                 }
             };
             QT_CHARTS_END_NAMESPACE
             #include "chartsqml2_plugin.moc"
             QT_CHARTS_USE_NAMESPACE

src/chartsqml2/declarativecategoryaxis.cpp +14 0

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #include "declarativecategoryaxis.h"
             #include <QtCore/QDebug>
             QT_CHARTS_BEGIN_NAMESPACE
             /*!
                 \qmltype CategoryRange
                 \inqmlmodule QtCharts
                 \brief With CategoryRange you can define a range used by a CategoryAxis.
                 \sa CategoryAxis
             */
             DeclarativeCategoryRange::DeclarativeCategoryRange(QObject *parent) :
                 QObject(parent),
                 m_endValue(0),
                 m_label(QString())
             {
             }
             DeclarativeCategoryAxis::DeclarativeCategoryAxis(QObject *parent) :
                 QCategoryAxis(parent)
             {
             }
             void DeclarativeCategoryAxis::classBegin()
             {
             }
             void DeclarativeCategoryAxis::componentComplete()
             {
                 QList<QPair<QString, qreal> > ranges;
                 foreach (QObject *child, children()) {
                     if (qobject_cast<DeclarativeCategoryRange *>(child)) {
                         DeclarativeCategoryRange *range = qobject_cast<DeclarativeCategoryRange *>(child);
                         ranges.append(QPair<QString, qreal>(range->label(), range->endValue()));
                     }
                 }
                 // Sort and append the range objects according to end value
                 qSort(ranges.begin(), ranges.end(), endValueLessThan);
                 for (int i(0); i < ranges.count(); i++)
                     append(ranges.at(i).first, ranges.at(i).second);
             }
             bool DeclarativeCategoryAxis::endValueLessThan(const QPair<QString, qreal> &value1, const QPair<QString, qreal> &value2)
             {
                 return value1.second < value2.second;
             }
             QQmlListProperty<QObject> DeclarativeCategoryAxis::axisChildren()
             {
                 return QQmlListProperty<QObject>(this, 0, &DeclarativeCategoryAxis::appendAxisChildren ,0,0,0);
             }
             void DeclarativeCategoryAxis::append(const QString &label, qreal categoryEndValue)
             {
                 QCategoryAxis::append(label, categoryEndValue);
             }
             void DeclarativeCategoryAxis::remove(const QString &label)
             {
                 QCategoryAxis::remove(label);
             }
             void DeclarativeCategoryAxis::replace(const QString &oldLabel, const QString &newLabel)
             {
                 QCategoryAxis::replaceLabel(oldLabel, newLabel);
             }
             void DeclarativeCategoryAxis::appendAxisChildren(QQmlListProperty<QObject> *list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list)
                 Q_UNUSED(element)
             }
+            DeclarativeCategoryAxis::AxisLabelsPosition DeclarativeCategoryAxis::labelsPosition() const
+            {
+                return (DeclarativeCategoryAxis::AxisLabelsPosition) QCategoryAxis::labelsPosition();
+            }
+            void DeclarativeCategoryAxis::setLabelsPosition(AxisLabelsPosition position)
+            {
+                QCategoryAxis::AxisLabelsPosition labelsPosition = (QCategoryAxis::AxisLabelsPosition) position;
+                if (labelsPosition != m_labelsPosition) {
+                    QCategoryAxis::setLabelsPosition(labelsPosition);
+                    emit labelsPositionChanged(position);
+                }
+            }
             #include "moc_declarativecategoryaxis.cpp"
             QT_CHARTS_END_NAMESPACE

src/chartsqml2/declarativecategoryaxis.h +19 0

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #ifndef DECLARATIVECATEGORYAXIS_H
             #define DECLARATIVECATEGORYAXIS_H
             #include <QtCharts/QCategoryAxis>
             #include <QtQml/QQmlListProperty>
             #include <QtQml/QQmlParserStatus>
             QT_CHARTS_BEGIN_NAMESPACE
             class DeclarativeCategoryRange : public QObject
             {
                 Q_OBJECT
                 Q_PROPERTY(qreal endValue READ endValue WRITE setEndValue)
                 Q_PROPERTY(QString label READ label WRITE setLabel)
             public:
                 explicit DeclarativeCategoryRange(QObject *parent = 0);
                 qreal endValue() { return m_endValue; }
                 void setEndValue(qreal endValue) { m_endValue = endValue; }
                 QString label() { return m_label; }
                 void setLabel(QString label) { m_label = label; }
             private:
                 qreal m_endValue;
                 QString m_label;
             };
             class DeclarativeCategoryAxis : public QCategoryAxis, public QQmlParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QQmlParserStatus)
                 Q_PROPERTY(QQmlListProperty<QObject> axisChildren READ axisChildren)
                 Q_CLASSINFO("DefaultProperty", "axisChildren")
+                Q_PROPERTY(AxisLabelsPosition labelsPosition READ labelsPosition WRITE setLabelsPosition NOTIFY labelsPositionChanged REVISION 1)
+                Q_ENUMS(AxisLabelsPosition)
             public:
+                // duplicating enums from QChart to make the QML api namings 1-to-1 with the C++ api
+                enum AxisLabelsPosition {
+                    AxisLabelsPositionCenter = 0x0,
+                    AxisLabelsPositionOnValue = 0x1
+                };
                 explicit DeclarativeCategoryAxis(QObject *parent = 0);
                 QQmlListProperty<QObject> axisChildren();
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
+            public:
+                AxisLabelsPosition labelsPosition() const;
+                void setLabelsPosition(AxisLabelsPosition position);
+            Q_SIGNALS:
+                Q_REVISION(1) void labelsPositionChanged(AxisLabelsPosition position);
             public Q_SLOTS:
                 Q_INVOKABLE void append(const QString &label, qreal categoryEndValue);
                 Q_INVOKABLE void remove(const QString &label);
                 Q_INVOKABLE void replace(const QString &oldLabel, const QString &newLabel);
                 static void appendAxisChildren(QQmlListProperty<QObject> *list, QObject *element);
             private:
                 static bool endValueLessThan(const QPair<QString, qreal> &value1, const QPair<QString, qreal> &value2);
+            private:
+                AxisLabelsPosition m_labelsPosition;
             };
             QT_CHARTS_END_NAMESPACE
             #endif // DECLARATIVECATEGORYAXIS_H

src/chartsqml2/plugins.qmltypes +31 -2

             import QtQuick.tooling 1.1
             // This file describes the plugin-supplied types contained in the library.
             // It is used for QML tooling purposes only.
             //
             // This file was auto-generated by:
             // 'qmlplugindump -nonrelocatable QtCharts 2.0'
             Module {
                 Component {
                     name: "QGraphicsObject"
                     defaultProperty: "children"
                     prototype: "QObject"
                     Property { name: "parent"; type: "QGraphicsObject"; isPointer: true }
                     Property { name: "opacity"; type: "double" }
                     Property { name: "enabled"; type: "bool" }
                     Property { name: "visible"; type: "bool" }
                     Property { name: "pos"; type: "QPointF" }
                     Property { name: "x"; type: "double" }
                     Property { name: "y"; type: "double" }
                     Property { name: "z"; type: "double" }
                     Property { name: "rotation"; type: "double" }
                     Property { name: "scale"; type: "double" }
                     Property { name: "transformOriginPoint"; type: "QPointF" }
                     Property { name: "effect"; type: "QGraphicsEffect"; isPointer: true }
                     Property {
                         name: "children"
                         type: "QDeclarativeListProperty<QGraphicsObject>"
                         isReadonly: true
                     }
                     Property { name: "width"; type: "double" }
                     Property { name: "height"; type: "double" }
                 }
                 Component {
                     name: "QGraphicsWidget"
                     defaultProperty: "children"
                     prototype: "QGraphicsObject"
                     Property { name: "palette"; type: "QPalette" }
                     Property { name: "font"; type: "QFont" }
                     Property { name: "layoutDirection"; type: "Qt::LayoutDirection" }
                     Property { name: "size"; type: "QSizeF" }
                     Property { name: "minimumSize"; type: "QSizeF" }
                     Property { name: "preferredSize"; type: "QSizeF" }
                     Property { name: "maximumSize"; type: "QSizeF" }
                     Property { name: "sizePolicy"; type: "QSizePolicy" }
                     Property { name: "focusPolicy"; type: "Qt::FocusPolicy" }
                     Property { name: "windowFlags"; type: "Qt::WindowFlags" }
                     Property { name: "windowTitle"; type: "string" }
                     Property { name: "geometry"; type: "QRectF" }
                     Property { name: "autoFillBackground"; type: "bool" }
                     Property { name: "layout"; type: "QGraphicsLayout"; isPointer: true }
                     Method { name: "close"; type: "bool" }
                 }
                 Component {
                     name: "QtCharts::DeclarativeAreaSeries"
                     prototype: "QtCharts::QAreaSeries"
                     exports: [
                         "QtCharts/AreaSeries 1.0",
                         "QtCharts/AreaSeries 1.1",
                         "QtCharts/AreaSeries 1.2",
                         "QtCharts/AreaSeries 1.3",
                         "QtCharts/AreaSeries 1.4",
                         "QtCharts/AreaSeries 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 1, 2, 3, 4, 4]
                     Property { name: "upperSeries"; type: "DeclarativeLineSeries"; isPointer: true }
                     Property { name: "lowerSeries"; type: "DeclarativeLineSeries"; isPointer: true }
                     Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisAngular"; revision: 3; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisRadial"; revision: 3; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "borderWidth"; revision: 1; type: "double" }
                     Property { name: "brushFilename"; revision: 4; type: "string" }
                     Property { name: "brush"; revision: 4; type: "QBrush" }
                     Signal {
                         name: "axisXChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "borderWidthChanged"
                         revision: 1
                         Parameter { name: "width"; type: "double" }
                     }
                     Signal {
                         name: "axisXTopChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYRightChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisAngularChanged"
                         revision: 3
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisRadialChanged"
                         revision: 3
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal { name: "brushChanged"; revision: 4 }
                     Signal {
                         name: "brushFilenameChanged"
                         revision: 4
                         Parameter { name: "brushFilename"; type: "string" }
                     }
                 }
                 Component {
                     name: "QtCharts::DeclarativeAxes"
                     prototype: "QObject"
                     exports: [
                         "QtCharts/DeclarativeAxes 1.0",
                         "QtCharts/DeclarativeAxes 2.0"
                     ]
                     isCreatable: false
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "axisX"; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisY"; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisXTop"; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisYRight"; type: "QAbstractAxis"; isPointer: true }
                     Signal {
                         name: "axisXChanged"
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYChanged"
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisXTopChanged"
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYRightChanged"
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                 }
                 Component {
                     name: "QtCharts::DeclarativeBarSeries"
                     defaultProperty: "seriesChildren"
                     prototype: "QtCharts::QBarSeries"
                     exports: [
                         "QtCharts/BarSeries 1.0",
                         "QtCharts/BarSeries 1.1",
                         "QtCharts/BarSeries 1.2",
                         "QtCharts/BarSeries 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 1, 2, 2]
                     Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
                     Signal {
                         name: "axisXChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisXTopChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYRightChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Method {
                         name: "appendSeriesChildren"
                         Parameter { name: "list"; type: "QObject"; isList: true; isPointer: true }
                         Parameter { name: "element"; type: "QObject"; isPointer: true }
                     }
                     Method {
                         name: "at"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "append"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "label"; type: "string" }
                         Parameter { name: "values"; type: "QVariantList" }
                     }
                     Method {
                         name: "insert"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "label"; type: "string" }
                         Parameter { name: "values"; type: "QVariantList" }
                     }
                     Method {
                         name: "remove"
                         type: "bool"
                         Parameter { name: "barset"; type: "QBarSet"; isPointer: true }
                     }
                     Method { name: "clear" }
                 }
                 Component {
                     name: "QtCharts::DeclarativeBarSet"
                     prototype: "QtCharts::QBarSet"
                     exports: [
                         "QtCharts/BarSet 1.0",
                         "QtCharts/BarSet 1.1",
                         "QtCharts/BarSet 1.4",
                         "QtCharts/BarSet 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 0, 2, 2]
                     Property { name: "values"; type: "QVariantList" }
                     Property { name: "borderWidth"; revision: 1; type: "double" }
                     Property { name: "count"; type: "int"; isReadonly: true }
                     Property { name: "brushFilename"; revision: 2; type: "string" }
                     Signal {
                         name: "countChanged"
                         Parameter { name: "count"; type: "int" }
                     }
                     Signal {
                         name: "borderWidthChanged"
                         revision: 1
                         Parameter { name: "width"; type: "double" }
                     }
                     Signal {
                         name: "brushFilenameChanged"
                         revision: 2
                         Parameter { name: "brushFilename"; type: "string" }
                     }
                     Method {
                         name: "append"
                         Parameter { name: "value"; type: "double" }
                     }
                     Method {
                         name: "remove"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "count"; type: "int" }
                     }
                     Method {
                         name: "remove"
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "replace"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "value"; type: "double" }
                     }
                     Method {
                         name: "at"
                         type: "double"
                         Parameter { name: "index"; type: "int" }
                     }
                 }
                 Component {
                     name: "QtCharts::DeclarativeBoxPlotSeries"
                     defaultProperty: "seriesChildren"
                     prototype: "QtCharts::QBoxPlotSeries"
                     exports: [
                         "QtCharts/BoxPlotSeries 1.3",
                         "QtCharts/BoxPlotSeries 1.4",
                         "QtCharts/BoxPlotSeries 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 1, 1]
                     Property { name: "axisX"; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisY"; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisXTop"; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisYRight"; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
                     Property { name: "brushFilename"; revision: 1; type: "string" }
                     Signal {
                         name: "axisXChanged"
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYChanged"
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisXTopChanged"
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYRightChanged"
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "clicked"
                         Parameter { name: "boxset"; type: "DeclarativeBoxSet"; isPointer: true }
                     }
                     Signal {
                         name: "hovered"
                         Parameter { name: "status"; type: "bool" }
                         Parameter { name: "boxset"; type: "DeclarativeBoxSet"; isPointer: true }
                     }
                     Signal {
                         name: "pressed"
                         Parameter { name: "boxset"; type: "DeclarativeBoxSet"; isPointer: true }
                     }
                     Signal {
                         name: "released"
                         Parameter { name: "boxset"; type: "DeclarativeBoxSet"; isPointer: true }
                     }
                     Signal {
                         name: "doubleClicked"
                         Parameter { name: "boxset"; type: "DeclarativeBoxSet"; isPointer: true }
                     }
                     Signal {
                         name: "brushFilenameChanged"
                         revision: 1
                         Parameter { name: "brushFilename"; type: "string" }
                     }
                     Method {
                         name: "appendSeriesChildren"
                         Parameter { name: "list"; type: "QObject"; isList: true; isPointer: true }
                         Parameter { name: "element"; type: "QObject"; isPointer: true }
                     }
                     Method {
                         name: "onHovered"
                         Parameter { name: "status"; type: "bool" }
                         Parameter { name: "boxset"; type: "QBoxSet"; isPointer: true }
                     }
                     Method {
                         name: "onClicked"
                         Parameter { name: "boxset"; type: "QBoxSet"; isPointer: true }
                     }
                     Method {
                         name: "onPressed"
                         Parameter { name: "boxset"; type: "QBoxSet"; isPointer: true }
                     }
                     Method {
                         name: "onReleased"
                         Parameter { name: "boxset"; type: "QBoxSet"; isPointer: true }
                     }
                     Method {
                         name: "onDoubleClicked"
                         Parameter { name: "boxset"; type: "QBoxSet"; isPointer: true }
                     }
                     Method {
                         name: "at"
                         type: "DeclarativeBoxSet*"
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "append"
                         type: "DeclarativeBoxSet*"
                         Parameter { name: "label"; type: "string" }
                         Parameter { name: "values"; type: "QVariantList" }
                     }
                     Method {
                         name: "append"
                         Parameter { name: "box"; type: "DeclarativeBoxSet"; isPointer: true }
                     }
                     Method {
                         name: "insert"
                         type: "DeclarativeBoxSet*"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "label"; type: "string" }
                         Parameter { name: "values"; type: "QVariantList" }
                     }
                     Method {
                         name: "remove"
                         type: "bool"
                         Parameter { name: "box"; type: "DeclarativeBoxSet"; isPointer: true }
                     }
                     Method { name: "clear" }
                 }
                 Component {
                     name: "QtCharts::DeclarativeBoxSet"
                     prototype: "QtCharts::QBoxSet"
                     exports: [
                         "QtCharts/BoxSet 1.3",
                         "QtCharts/BoxSet 1.4",
                         "QtCharts/BoxSet 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 1, 1]
                     Enum {
                         name: "ValuePositions"
                         values: {
                             "LowerExtreme": 0,
                             "LowerQuartile": 1,
                             "Median": 2,
                             "UpperQuartile": 3,
                             "UpperExtreme": 4
                         }
                     }
                     Property { name: "values"; type: "QVariantList" }
                     Property { name: "label"; type: "string" }
                     Property { name: "count"; type: "int"; isReadonly: true }
                     Property { name: "brushFilename"; revision: 1; type: "string" }
                     Signal { name: "changedValues" }
                     Signal {
                         name: "changedValue"
                         Parameter { name: "index"; type: "int" }
                     }
                     Signal {
                         name: "brushFilenameChanged"
                         revision: 1
                         Parameter { name: "brushFilename"; type: "string" }
                     }
                     Method {
                         name: "append"
                         Parameter { name: "value"; type: "double" }
                     }
                     Method { name: "clear" }
                     Method {
                         name: "at"
                         type: "double"
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "setValue"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "value"; type: "double" }
                     }
                 }
                 Component {
                     name: "QtCharts::DeclarativeCategoryAxis"
                     defaultProperty: "axisChildren"
                     prototype: "QtCharts::QCategoryAxis"
-                    exports: ["QtCharts/CategoryAxis 1.1", "QtCharts/CategoryAxis 2.0"]
+                    exports: [
-                    exportMetaObjectRevisions: [0, 0]
+                        "QtCharts/CategoryAxis 1.1",
+                        "QtCharts/CategoryAxis 2.0",
+                        "QtCharts/CategoryAxis 2.1"
+                    ]
+                    exportMetaObjectRevisions: [0, 0, 1]
+                    Enum {
+                        name: "AxisLabelsPosition"
+                        values: {
+                            "AxisLabelsPositionCenter": 0,
+                            "AxisLabelsPositionOnValue": 1
+                        }
+                    }
                     Property { name: "axisChildren"; type: "QObject"; isList: true; isReadonly: true }
+                    Property { name: "labelsPosition"; revision: 1; type: "AxisLabelsPosition" }
+                    Signal {
+                        name: "labelsPositionChanged"
+                        revision: 1
+                        Parameter { name: "position"; type: "AxisLabelsPosition" }
+                    }
                     Method {
                         name: "append"
                         Parameter { name: "label"; type: "string" }
                         Parameter { name: "categoryEndValue"; type: "double" }
                     }
                     Method {
                         name: "remove"
                         Parameter { name: "label"; type: "string" }
                     }
                     Method {
                         name: "replace"
                         Parameter { name: "oldLabel"; type: "string" }
                         Parameter { name: "newLabel"; type: "string" }
                     }
                     Method {
                         name: "appendAxisChildren"
                         Parameter { name: "list"; type: "QObject"; isList: true; isPointer: true }
                         Parameter { name: "element"; type: "QObject"; isPointer: true }
                     }
                 }
                 Component {
                     name: "QtCharts::DeclarativeCategoryRange"
                     prototype: "QObject"
                     exports: ["QtCharts/CategoryRange 1.1", "QtCharts/CategoryRange 2.0"]
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "endValue"; type: "double" }
                     Property { name: "label"; type: "string" }
                 }
                 Component {
                     name: "QtCharts::DeclarativeChart"
                     defaultProperty: "data"
                     prototype: "QQuickPaintedItem"
                     exports: [
                         "QtCharts/ChartView 1.0",
                         "QtCharts/ChartView 1.1",
                         "QtCharts/ChartView 1.2",
                         "QtCharts/ChartView 1.3",
                         "QtCharts/ChartView 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 1, 2, 3, 4]
                     Enum {
                         name: "Theme"
                         values: {
                             "ChartThemeLight": 0,
                             "ChartThemeBlueCerulean": 1,
                             "ChartThemeDark": 2,
                             "ChartThemeBrownSand": 3,
                             "ChartThemeBlueNcs": 4,
                             "ChartThemeHighContrast": 5,
                             "ChartThemeBlueIcy": 6,
                             "ChartThemeQt": 7
                         }
                     }
                     Enum {
                         name: "Animation"
                         values: {
                             "NoAnimation": 0,
                             "GridAxisAnimations": 1,
                             "SeriesAnimations": 2,
                             "AllAnimations": 3
                         }
                     }
                     Enum {
                         name: "SeriesType"
                         values: {
                             "SeriesTypeLine": 0,
                             "SeriesTypeArea": 1,
                             "SeriesTypeBar": 2,
                             "SeriesTypeStackedBar": 3,
                             "SeriesTypePercentBar": 4,
                             "SeriesTypeBoxPlot": 5,
                             "SeriesTypePie": 6,
                             "SeriesTypeScatter": 7,
                             "SeriesTypeSpline": 8,
                             "SeriesTypeHorizontalBar": 9,
                             "SeriesTypeHorizontalStackedBar": 10,
                             "SeriesTypeHorizontalPercentBar": 11
                         }
                     }
                     Property { name: "theme"; type: "Theme" }
                     Property { name: "animationOptions"; type: "Animation" }
                     Property { name: "title"; type: "string" }
                     Property { name: "titleFont"; type: "QFont" }
                     Property { name: "titleColor"; type: "QColor" }
                     Property { name: "legend"; type: "QLegend"; isReadonly: true; isPointer: true }
                     Property { name: "count"; type: "int"; isReadonly: true }
                     Property { name: "backgroundColor"; type: "QColor" }
                     Property { name: "dropShadowEnabled"; type: "bool" }
                     Property { name: "backgroundRoundness"; revision: 3; type: "double" }
                     Property {
                         name: "margins"
                         revision: 2
                         type: "DeclarativeMargins"
                         isReadonly: true
                         isPointer: true
                     }
                     Property { name: "plotArea"; revision: 1; type: "QRectF"; isReadonly: true }
                     Property { name: "plotAreaColor"; revision: 3; type: "QColor" }
                     Property { name: "axes"; revision: 2; type: "QAbstractAxis"; isList: true; isReadonly: true }
                     Property { name: "localizeNumbers"; revision: 4; type: "bool" }
                     Property { name: "locale"; revision: 4; type: "QLocale" }
                     Signal { name: "axisLabelsChanged" }
                     Signal {
                         name: "titleColorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                     Signal {
                         name: "dropShadowEnabledChanged"
                         Parameter { name: "enabled"; type: "bool" }
                     }
                     Signal { name: "marginsChanged"; revision: 2 }
                     Signal {
                         name: "plotAreaChanged"
                         Parameter { name: "plotArea"; type: "QRectF" }
                     }
                     Signal {
                         name: "seriesAdded"
                         Parameter { name: "series"; type: "QAbstractSeries"; isPointer: true }
                     }
                     Signal {
                         name: "seriesRemoved"
                         Parameter { name: "series"; type: "QAbstractSeries"; isPointer: true }
                     }
                     Signal { name: "plotAreaColorChanged"; revision: 3 }
                     Signal {
                         name: "backgroundRoundnessChanged"
                         revision: 3
                         Parameter { name: "diameter"; type: "double" }
                     }
                     Signal { name: "localizeNumbersChanged"; revision: 4 }
                     Signal { name: "localeChanged"; revision: 4 }
                     Method {
                         name: "series"
                         type: "QAbstractSeries*"
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "series"
                         type: "QAbstractSeries*"
                         Parameter { name: "seriesName"; type: "string" }
                     }
                     Method {
                         name: "createSeries"
                         type: "QAbstractSeries*"
                         Parameter { name: "type"; type: "int" }
                         Parameter { name: "name"; type: "string" }
                         Parameter { name: "axisX"; type: "QAbstractAxis"; isPointer: true }
                         Parameter { name: "axisY"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Method {
                         name: "createSeries"
                         type: "QAbstractSeries*"
                         Parameter { name: "type"; type: "int" }
                         Parameter { name: "name"; type: "string" }
                         Parameter { name: "axisX"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Method {
                         name: "createSeries"
                         type: "QAbstractSeries*"
                         Parameter { name: "type"; type: "int" }
                         Parameter { name: "name"; type: "string" }
                     }
                     Method {
                         name: "createSeries"
                         type: "QAbstractSeries*"
                         Parameter { name: "type"; type: "int" }
                     }
                     Method {
                         name: "removeSeries"
                         Parameter { name: "series"; type: "QAbstractSeries"; isPointer: true }
                     }
                     Method { name: "removeAllSeries" }
                     Method {
                         name: "setAxisX"
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                         Parameter { name: "series"; type: "QAbstractSeries"; isPointer: true }
                     }
                     Method {
                         name: "setAxisX"
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Method {
                         name: "setAxisY"
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                         Parameter { name: "series"; type: "QAbstractSeries"; isPointer: true }
                     }
                     Method {
                         name: "setAxisY"
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Method {
                         name: "axisX"
                         type: "QAbstractAxis*"
                         Parameter { name: "series"; type: "QAbstractSeries"; isPointer: true }
                     }
                     Method { name: "axisX"; type: "QAbstractAxis*" }
                     Method {
                         name: "axisY"
                         type: "QAbstractAxis*"
                         Parameter { name: "series"; type: "QAbstractSeries"; isPointer: true }
                     }
                     Method { name: "axisY"; type: "QAbstractAxis*" }
                     Method {
                         name: "zoom"
                         Parameter { name: "factor"; type: "double" }
                     }
                     Method {
                         name: "scrollLeft"
                         Parameter { name: "pixels"; type: "double" }
                     }
                     Method {
                         name: "scrollRight"
                         Parameter { name: "pixels"; type: "double" }
                     }
                     Method {
                         name: "scrollUp"
                         Parameter { name: "pixels"; type: "double" }
                     }
                     Method {
                         name: "scrollDown"
                         Parameter { name: "pixels"; type: "double" }
                     }
                 }
                 Component {
                     name: "QtCharts::DeclarativeHorizontalBarSeries"
                     defaultProperty: "seriesChildren"
                     prototype: "QtCharts::QHorizontalBarSeries"
                     exports: [
                         "QtCharts/HorizontalBarSeries 1.1",
                         "QtCharts/HorizontalBarSeries 1.2",
                         "QtCharts/HorizontalBarSeries 2.0"
                     ]
                     exportMetaObjectRevisions: [1, 2, 2]
                     Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
                     Signal {
                         name: "axisXChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisXTopChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYRightChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Method {
                         name: "appendSeriesChildren"
                         Parameter { name: "list"; type: "QObject"; isList: true; isPointer: true }
                         Parameter { name: "element"; type: "QObject"; isPointer: true }
                     }
                     Method {
                         name: "at"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "append"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "label"; type: "string" }
                         Parameter { name: "values"; type: "QVariantList" }
                     }
                     Method {
                         name: "insert"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "label"; type: "string" }
                         Parameter { name: "values"; type: "QVariantList" }
                     }
                     Method {
                         name: "remove"
                         type: "bool"
                         Parameter { name: "barset"; type: "QBarSet"; isPointer: true }
                     }
                     Method { name: "clear" }
                 }
                 Component {
                     name: "QtCharts::DeclarativeHorizontalPercentBarSeries"
                     defaultProperty: "seriesChildren"
                     prototype: "QtCharts::QHorizontalPercentBarSeries"
                     exports: [
                         "QtCharts/HorizontalPercentBarSeries 1.1",
                         "QtCharts/HorizontalPercentBarSeries 1.2",
                         "QtCharts/HorizontalPercentBarSeries 2.0"
                     ]
                     exportMetaObjectRevisions: [1, 2, 2]
                     Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
                     Signal {
                         name: "axisXChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisXTopChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYRightChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Method {
                         name: "appendSeriesChildren"
                         Parameter { name: "list"; type: "QObject"; isList: true; isPointer: true }
                         Parameter { name: "element"; type: "QObject"; isPointer: true }
                     }
                     Method {
                         name: "at"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "append"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "label"; type: "string" }
                         Parameter { name: "values"; type: "QVariantList" }
                     }
                     Method {
                         name: "insert"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "label"; type: "string" }
                         Parameter { name: "values"; type: "QVariantList" }
                     }
                     Method {
                         name: "remove"
                         type: "bool"
                         Parameter { name: "barset"; type: "QBarSet"; isPointer: true }
                     }
                     Method { name: "clear" }
                 }
                 Component {
                     name: "QtCharts::DeclarativeHorizontalStackedBarSeries"
                     defaultProperty: "seriesChildren"
                     prototype: "QtCharts::QHorizontalStackedBarSeries"
                     exports: [
                         "QtCharts/HorizontalStackedBarSeries 1.1",
                         "QtCharts/HorizontalStackedBarSeries 1.2",
                         "QtCharts/HorizontalStackedBarSeries 2.0"
                     ]
                     exportMetaObjectRevisions: [1, 2, 2]
                     Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
                     Signal {
                         name: "axisXChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisXTopChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYRightChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Method {
                         name: "appendSeriesChildren"
                         Parameter { name: "list"; type: "QObject"; isList: true; isPointer: true }
                         Parameter { name: "element"; type: "QObject"; isPointer: true }
                     }
                     Method {
                         name: "at"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "append"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "label"; type: "string" }
                         Parameter { name: "values"; type: "QVariantList" }
                     }
                     Method {
                         name: "insert"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "label"; type: "string" }
                         Parameter { name: "values"; type: "QVariantList" }
                     }
                     Method {
                         name: "remove"
                         type: "bool"
                         Parameter { name: "barset"; type: "QBarSet"; isPointer: true }
                     }
                     Method { name: "clear" }
                 }
                 Component {
                     name: "QtCharts::DeclarativeLineSeries"
                     defaultProperty: "declarativeChildren"
                     prototype: "QtCharts::QLineSeries"
                     exports: [
                         "QtCharts/LineSeries 1.0",
                         "QtCharts/LineSeries 1.1",
                         "QtCharts/LineSeries 1.2",
                         "QtCharts/LineSeries 1.3",
                         "QtCharts/LineSeries 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 1, 2, 3, 3]
                     Property { name: "count"; type: "int"; isReadonly: true }
                     Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisAngular"; revision: 3; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisRadial"; revision: 3; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "width"; revision: 1; type: "double" }
                     Property { name: "style"; revision: 1; type: "Qt::PenStyle" }
                     Property { name: "capStyle"; revision: 1; type: "Qt::PenCapStyle" }
                     Property { name: "declarativeChildren"; type: "QObject"; isList: true; isReadonly: true }
                     Signal {
                         name: "countChanged"
                         Parameter { name: "count"; type: "int" }
                     }
                     Signal {
                         name: "axisXChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisXTopChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYRightChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisAngularChanged"
                         revision: 3
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisRadialChanged"
                         revision: 3
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "widthChanged"
                         revision: 1
                         Parameter { name: "width"; type: "double" }
                     }
                     Signal {
                         name: "styleChanged"
                         revision: 1
                         Parameter { name: "style"; type: "Qt::PenStyle" }
                     }
                     Signal {
                         name: "capStyleChanged"
                         revision: 1
                         Parameter { name: "capStyle"; type: "Qt::PenCapStyle" }
                     }
                     Method {
                         name: "appendDeclarativeChildren"
                         Parameter { name: "list"; type: "QObject"; isList: true; isPointer: true }
                         Parameter { name: "element"; type: "QObject"; isPointer: true }
                     }
                     Method {
                         name: "handleCountChanged"
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "append"
                         Parameter { name: "x"; type: "double" }
                         Parameter { name: "y"; type: "double" }
                     }
                     Method {
                         name: "replace"
                         Parameter { name: "oldX"; type: "double" }
                         Parameter { name: "oldY"; type: "double" }
                         Parameter { name: "newX"; type: "double" }
                         Parameter { name: "newY"; type: "double" }
                     }
                     Method {
                         name: "replace"
                         revision: 3
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "newX"; type: "double" }
                         Parameter { name: "newY"; type: "double" }
                     }
                     Method {
                         name: "remove"
                         Parameter { name: "x"; type: "double" }
                         Parameter { name: "y"; type: "double" }
                     }
                     Method {
                         name: "remove"
                         revision: 3
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "insert"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "x"; type: "double" }
                         Parameter { name: "y"; type: "double" }
                     }
                     Method { name: "clear" }
                     Method {
                         name: "at"
                         type: "QPointF"
                         Parameter { name: "index"; type: "int" }
                     }
                 }
                 Component {
                     name: "QtCharts::DeclarativeMargins"
                     prototype: "QObject"
                     exports: ["QtCharts/Margins 1.1", "QtCharts/Margins 2.0"]
                     isCreatable: false
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "top"; type: "int" }
                     Property { name: "bottom"; type: "int" }
                     Property { name: "left"; type: "int" }
                     Property { name: "right"; type: "int" }
                     Signal {
                         name: "topChanged"
                         Parameter { name: "top"; type: "int" }
                         Parameter { name: "bottom"; type: "int" }
                         Parameter { name: "left"; type: "int" }
                         Parameter { name: "right"; type: "int" }
                     }
                     Signal {
                         name: "bottomChanged"
                         Parameter { name: "top"; type: "int" }
                         Parameter { name: "bottom"; type: "int" }
                         Parameter { name: "left"; type: "int" }
                         Parameter { name: "right"; type: "int" }
                     }
                     Signal {
                         name: "leftChanged"
                         Parameter { name: "top"; type: "int" }
                         Parameter { name: "bottom"; type: "int" }
                         Parameter { name: "left"; type: "int" }
                         Parameter { name: "right"; type: "int" }
                     }
                     Signal {
                         name: "rightChanged"
                         Parameter { name: "top"; type: "int" }
                         Parameter { name: "bottom"; type: "int" }
                         Parameter { name: "left"; type: "int" }
                         Parameter { name: "right"; type: "int" }
                     }
                 }
                 Component {
                     name: "QtCharts::DeclarativePercentBarSeries"
                     defaultProperty: "seriesChildren"
                     prototype: "QtCharts::QPercentBarSeries"
                     exports: [
                         "QtCharts/PercentBarSeries 1.0",
                         "QtCharts/PercentBarSeries 1.1",
                         "QtCharts/PercentBarSeries 1.2",
                         "QtCharts/PercentBarSeries 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 1, 2, 2]
                     Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
                     Signal {
                         name: "axisXChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisXTopChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYRightChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Method {
                         name: "appendSeriesChildren"
                         Parameter { name: "list"; type: "QObject"; isList: true; isPointer: true }
                         Parameter { name: "element"; type: "QObject"; isPointer: true }
                     }
                     Method {
                         name: "at"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "append"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "label"; type: "string" }
                         Parameter { name: "values"; type: "QVariantList" }
                     }
                     Method {
                         name: "insert"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "label"; type: "string" }
                         Parameter { name: "values"; type: "QVariantList" }
                     }
                     Method {
                         name: "remove"
                         type: "bool"
                         Parameter { name: "barset"; type: "QBarSet"; isPointer: true }
                     }
                     Method { name: "clear" }
                 }
                 Component {
                     name: "QtCharts::DeclarativePieSeries"
                     defaultProperty: "seriesChildren"
                     prototype: "QtCharts::QPieSeries"
                     exports: [
                         "QtCharts/PieSeries 1.0",
                         "QtCharts/PieSeries 1.1",
                         "QtCharts/PieSeries 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 0, 0]
                     Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
                     Signal {
                         name: "sliceAdded"
                         Parameter { name: "slice"; type: "QPieSlice"; isPointer: true }
                     }
                     Signal {
                         name: "sliceRemoved"
                         Parameter { name: "slice"; type: "QPieSlice"; isPointer: true }
                     }
                     Method {
                         name: "appendSeriesChildren"
                         Parameter { name: "list"; type: "QObject"; isList: true; isPointer: true }
                         Parameter { name: "element"; type: "QObject"; isPointer: true }
                     }
                     Method {
                         name: "handleAdded"
                         Parameter { name: "slices"; type: "QList<QPieSlice*>" }
                     }
                     Method {
                         name: "handleRemoved"
                         Parameter { name: "slices"; type: "QList<QPieSlice*>" }
                     }
                     Method {
                         name: "at"
                         type: "QPieSlice*"
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "find"
                         type: "QPieSlice*"
                         Parameter { name: "label"; type: "string" }
                     }
                     Method {
                         name: "append"
                         type: "DeclarativePieSlice*"
                         Parameter { name: "label"; type: "string" }
                         Parameter { name: "value"; type: "double" }
                     }
                     Method {
                         name: "remove"
                         type: "bool"
                         Parameter { name: "slice"; type: "QPieSlice"; isPointer: true }
                     }
                     Method { name: "clear" }
                 }
                 Component {
                     name: "QtCharts::DeclarativePieSlice"
                     prototype: "QtCharts::QPieSlice"
                     exports: ["QtCharts/PieSlice 1.4", "QtCharts/PieSlice 2.0"]
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "brushFilename"; type: "string" }
                     Signal {
                         name: "brushFilenameChanged"
                         Parameter { name: "brushFilename"; type: "string" }
                     }
                 }
                 Component {
                     name: "QtCharts::DeclarativePolarChart"
                     defaultProperty: "data"
                     prototype: "QtCharts::DeclarativeChart"
                     exports: [
                         "QtCharts/PolarChartView 1.3",
                         "QtCharts/PolarChartView 2.0"
                     ]
                     exportMetaObjectRevisions: [1, 1]
                 }
                 Component {
                     name: "QtCharts::DeclarativeScatterSeries"
                     defaultProperty: "declarativeChildren"
                     prototype: "QtCharts::QScatterSeries"
                     exports: [
                         "QtCharts/ScatterSeries 1.0",
                         "QtCharts/ScatterSeries 1.1",
                         "QtCharts/ScatterSeries 1.2",
                         "QtCharts/ScatterSeries 1.3",
                         "QtCharts/ScatterSeries 1.4",
                         "QtCharts/ScatterSeries 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 1, 2, 3, 4, 4]
                     Property { name: "count"; type: "int"; isReadonly: true }
                     Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisAngular"; revision: 3; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisRadial"; revision: 3; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "borderWidth"; revision: 1; type: "double" }
                     Property { name: "declarativeChildren"; type: "QObject"; isList: true; isReadonly: true }
                     Property { name: "brushFilename"; revision: 4; type: "string" }
                     Property { name: "brush"; revision: 4; type: "QBrush" }
                     Signal {
                         name: "countChanged"
                         Parameter { name: "count"; type: "int" }
                     }
                     Signal {
                         name: "axisXChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "borderWidthChanged"
                         revision: 1
                         Parameter { name: "width"; type: "double" }
                     }
                     Signal {
                         name: "axisXTopChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYRightChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisAngularChanged"
                         revision: 3
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisRadialChanged"
                         revision: 3
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "brushFilenameChanged"
                         revision: 4
                         Parameter { name: "brushFilename"; type: "string" }
                     }
                     Signal { name: "brushChanged"; revision: 4 }
                     Method {
                         name: "appendDeclarativeChildren"
                         Parameter { name: "list"; type: "QObject"; isList: true; isPointer: true }
                         Parameter { name: "element"; type: "QObject"; isPointer: true }
                     }
                     Method {
                         name: "handleCountChanged"
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "append"
                         Parameter { name: "x"; type: "double" }
                         Parameter { name: "y"; type: "double" }
                     }
                     Method {
                         name: "replace"
                         Parameter { name: "oldX"; type: "double" }
                         Parameter { name: "oldY"; type: "double" }
                         Parameter { name: "newX"; type: "double" }
                         Parameter { name: "newY"; type: "double" }
                     }
                     Method {
                         name: "replace"
                         revision: 3
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "newX"; type: "double" }
                         Parameter { name: "newY"; type: "double" }
                     }
                     Method {
                         name: "remove"
                         Parameter { name: "x"; type: "double" }
                         Parameter { name: "y"; type: "double" }
                     }
                     Method {
                         name: "remove"
                         revision: 3
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "insert"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "x"; type: "double" }
                         Parameter { name: "y"; type: "double" }
                     }
                     Method { name: "clear" }
                     Method {
                         name: "at"
                         type: "QPointF"
                         Parameter { name: "index"; type: "int" }
                     }
                 }
                 Component {
                     name: "QtCharts::DeclarativeSplineSeries"
                     defaultProperty: "declarativeChildren"
                     prototype: "QtCharts::QSplineSeries"
                     exports: [
                         "QtCharts/SplineSeries 1.0",
                         "QtCharts/SplineSeries 1.1",
                         "QtCharts/SplineSeries 1.2",
                         "QtCharts/SplineSeries 1.3",
                         "QtCharts/SplineSeries 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 1, 2, 3, 3]
                     Property { name: "count"; type: "int"; isReadonly: true }
                     Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisAngular"; revision: 3; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisRadial"; revision: 3; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "width"; revision: 1; type: "double" }
                     Property { name: "style"; revision: 1; type: "Qt::PenStyle" }
                     Property { name: "capStyle"; revision: 1; type: "Qt::PenCapStyle" }
                     Property { name: "declarativeChildren"; type: "QObject"; isList: true; isReadonly: true }
                     Signal {
                         name: "countChanged"
                         Parameter { name: "count"; type: "int" }
                     }
                     Signal {
                         name: "axisXChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisXTopChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYRightChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisAngularChanged"
                         revision: 3
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisRadialChanged"
                         revision: 3
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "widthChanged"
                         revision: 1
                         Parameter { name: "width"; type: "double" }
                     }
                     Signal {
                         name: "styleChanged"
                         revision: 1
                         Parameter { name: "style"; type: "Qt::PenStyle" }
                     }
                     Signal {
                         name: "capStyleChanged"
                         revision: 1
                         Parameter { name: "capStyle"; type: "Qt::PenCapStyle" }
                     }
                     Method {
                         name: "appendDeclarativeChildren"
                         Parameter { name: "list"; type: "QObject"; isList: true; isPointer: true }
                         Parameter { name: "element"; type: "QObject"; isPointer: true }
                     }
                     Method {
                         name: "handleCountChanged"
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "append"
                         Parameter { name: "x"; type: "double" }
                         Parameter { name: "y"; type: "double" }
                     }
                     Method {
                         name: "replace"
                         Parameter { name: "oldX"; type: "double" }
                         Parameter { name: "oldY"; type: "double" }
                         Parameter { name: "newX"; type: "double" }
                         Parameter { name: "newY"; type: "double" }
                     }
                     Method {
                         name: "replace"
                         revision: 3
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "newX"; type: "double" }
                         Parameter { name: "newY"; type: "double" }
                     }
                     Method {
                         name: "remove"
                         Parameter { name: "x"; type: "double" }
                         Parameter { name: "y"; type: "double" }
                     }
                     Method {
                         name: "remove"
                         revision: 3
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "insert"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "x"; type: "double" }
                         Parameter { name: "y"; type: "double" }
                     }
                     Method { name: "clear" }
                     Method {
                         name: "at"
                         type: "QPointF"
                         Parameter { name: "index"; type: "int" }
                     }
                 }
                 Component {
                     name: "QtCharts::DeclarativeStackedBarSeries"
                     defaultProperty: "seriesChildren"
                     prototype: "QtCharts::QStackedBarSeries"
                     exports: [
                         "QtCharts/StackedBarSeries 1.0",
                         "QtCharts/StackedBarSeries 1.1",
                         "QtCharts/StackedBarSeries 1.2",
                         "QtCharts/StackedBarSeries 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 1, 2, 2]
                     Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
                     Signal {
                         name: "axisXChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYChanged"
                         revision: 1
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisXTopChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Signal {
                         name: "axisYRightChanged"
                         revision: 2
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
                     Method {
                         name: "appendSeriesChildren"
                         Parameter { name: "list"; type: "QObject"; isList: true; isPointer: true }
                         Parameter { name: "element"; type: "QObject"; isPointer: true }
                     }
                     Method {
                         name: "at"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "index"; type: "int" }
                     }
                     Method {
                         name: "append"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "label"; type: "string" }
                         Parameter { name: "values"; type: "QVariantList" }
                     }
                     Method {
                         name: "insert"
                         type: "DeclarativeBarSet*"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "label"; type: "string" }
                         Parameter { name: "values"; type: "QVariantList" }
                     }
                     Method {
                         name: "remove"
                         type: "bool"
                         Parameter { name: "barset"; type: "QBarSet"; isPointer: true }
                     }
                     Method { name: "clear" }
                 }
                 Component {
                     name: "QtCharts::DeclarativeXYPoint"
                     prototype: "QObject"
                     exports: ["QtCharts/XYPoint 1.0", "QtCharts/XYPoint 2.0"]
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "x"; type: "double" }
                     Property { name: "y"; type: "double" }
                 }
                 Component {
                     name: "QtCharts::LegendScroller"
                     defaultProperty: "children"
                     prototype: "QtCharts::QLegend"
                 }
                 Component {
                     name: "QtCharts::QAbstractAxis"
                     prototype: "QObject"
                     exports: ["QtCharts/AbstractAxis 1.0", "QtCharts/AbstractAxis 2.0"]
                     isCreatable: false
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "visible"; type: "bool" }
                     Property { name: "lineVisible"; type: "bool" }
                     Property { name: "linePen"; type: "QPen" }
                     Property { name: "color"; type: "QColor" }
                     Property { name: "labelsVisible"; type: "bool" }
                     Property { name: "labelsBrush"; type: "QBrush" }
                     Property { name: "labelsAngle"; type: "int" }
                     Property { name: "labelsFont"; type: "QFont" }
                     Property { name: "labelsColor"; type: "QColor" }
                     Property { name: "gridVisible"; type: "bool" }
                     Property { name: "gridLinePen"; type: "QPen" }
                     Property { name: "shadesVisible"; type: "bool" }
                     Property { name: "shadesColor"; type: "QColor" }
                     Property { name: "shadesBorderColor"; type: "QColor" }
                     Property { name: "shadesPen"; type: "QPen" }
                     Property { name: "shadesBrush"; type: "QBrush" }
                     Property { name: "titleText"; type: "string" }
                     Property { name: "titleBrush"; type: "QBrush" }
                     Property { name: "titleVisible"; type: "bool" }
                     Property { name: "titleFont"; type: "QFont" }
                     Property { name: "orientation"; type: "Qt::Orientation"; isReadonly: true }
                     Property { name: "alignment"; type: "Qt::Alignment"; isReadonly: true }
                     Signal {
                         name: "visibleChanged"
                         Parameter { name: "visible"; type: "bool" }
                     }
                     Signal {
                         name: "linePenChanged"
                         Parameter { name: "pen"; type: "QPen" }
                     }
                     Signal {
                         name: "lineVisibleChanged"
                         Parameter { name: "visible"; type: "bool" }
                     }
                     Signal {
                         name: "labelsVisibleChanged"
                         Parameter { name: "visible"; type: "bool" }
                     }
                     Signal {
                         name: "labelsBrushChanged"
                         Parameter { name: "brush"; type: "QBrush" }
                     }
                     Signal {
                         name: "labelsFontChanged"
                         Parameter { name: "pen"; type: "QFont" }
                     }
                     Signal {
                         name: "labelsAngleChanged"
                         Parameter { name: "angle"; type: "int" }
                     }
                     Signal {
                         name: "gridLinePenChanged"
                         Parameter { name: "pen"; type: "QPen" }
                     }
                     Signal {
                         name: "gridVisibleChanged"
                         Parameter { name: "visible"; type: "bool" }
                     }
                     Signal {
                         name: "colorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                     Signal {
                         name: "labelsColorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                     Signal {
                         name: "titleTextChanged"
                         Parameter { name: "title"; type: "string" }
                     }
                     Signal {
                         name: "titleBrushChanged"
                         Parameter { name: "brush"; type: "QBrush" }
                     }
                     Signal {
                         name: "titleVisibleChanged"
                         Parameter { name: "visible"; type: "bool" }
                     }
                     Signal {
                         name: "titleFontChanged"
                         Parameter { name: "font"; type: "QFont" }
                     }
                     Signal {
                         name: "shadesVisibleChanged"
                         Parameter { name: "visible"; type: "bool" }
                     }
                     Signal {
                         name: "shadesColorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                     Signal {
                         name: "shadesBorderColorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                     Signal {
                         name: "shadesPenChanged"
                         Parameter { name: "pen"; type: "QPen" }
                     }
                     Signal {
                         name: "shadesBrushChanged"
                         Parameter { name: "brush"; type: "QBrush" }
                     }
                 }
                 Component {
                     name: "QtCharts::QAbstractBarSeries"
                     prototype: "QtCharts::QAbstractSeries"
                     exports: [
                         "QtCharts/AbstractBarSeries 1.0",
                         "QtCharts/AbstractBarSeries 2.0"
                     ]
                     isCreatable: false
                     exportMetaObjectRevisions: [0, 0]
                     Enum {
                         name: "LabelsPosition"
                         values: {
                             "LabelsCenter": 0,
                             "LabelsInsideEnd": 1,
                             "LabelsInsideBase": 2,
                             "LabelsOutsideEnd": 3
                         }
                     }
                     Property { name: "barWidth"; type: "double" }
                     Property { name: "count"; type: "int"; isReadonly: true }
                     Property { name: "labelsVisible"; type: "bool" }
                     Property { name: "labelsFormat"; type: "string" }
                     Property { name: "labelsPosition"; type: "LabelsPosition" }
                     Signal {
                         name: "clicked"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "barset"; type: "QBarSet"; isPointer: true }
                     }
                     Signal {
                         name: "hovered"
                         Parameter { name: "status"; type: "bool" }
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "barset"; type: "QBarSet"; isPointer: true }
                     }
                     Signal {
                         name: "pressed"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "barset"; type: "QBarSet"; isPointer: true }
                     }
                     Signal {
                         name: "released"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "barset"; type: "QBarSet"; isPointer: true }
                     }
                     Signal {
                         name: "doubleClicked"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "barset"; type: "QBarSet"; isPointer: true }
                     }
                     Signal {
                         name: "labelsFormatChanged"
                         Parameter { name: "format"; type: "string" }
                     }
                     Signal {
                         name: "labelsPositionChanged"
                         Parameter { name: "position"; type: "QAbstractBarSeries::LabelsPosition" }
                     }
                     Signal {
                         name: "barsetsAdded"
                         Parameter { name: "sets"; type: "QList<QBarSet*>" }
                     }
                     Signal {
                         name: "barsetsRemoved"
                         Parameter { name: "sets"; type: "QList<QBarSet*>" }
                     }
                 }
                 Component {
                     name: "QtCharts::QAbstractSeries"
                     prototype: "QObject"
                     exports: [
                         "QtCharts/AbstractSeries 1.0",
                         "QtCharts/AbstractSeries 2.0"
                     ]
                     isCreatable: false
                     exportMetaObjectRevisions: [0, 0]
                     Enum {
                         name: "SeriesType"
                         values: {
                             "SeriesTypeLine": 0,
                             "SeriesTypeArea": 1,
                             "SeriesTypeBar": 2,
                             "SeriesTypeStackedBar": 3,
                             "SeriesTypePercentBar": 4,
                             "SeriesTypePie": 5,
                             "SeriesTypeScatter": 6,
                             "SeriesTypeSpline": 7,
                             "SeriesTypeHorizontalBar": 8,
                             "SeriesTypeHorizontalStackedBar": 9,
                             "SeriesTypeHorizontalPercentBar": 10,
                             "SeriesTypeBoxPlot": 11
                         }
                     }
                     Property { name: "name"; type: "string" }
                     Property { name: "visible"; type: "bool" }
                     Property { name: "opacity"; type: "double" }
                     Property { name: "type"; type: "SeriesType"; isReadonly: true }
                 }
                 Component {
                     name: "QtCharts::QAreaSeries"
                     prototype: "QtCharts::QAbstractSeries"
                     Property { name: "upperSeries"; type: "QLineSeries"; isReadonly: true; isPointer: true }
                     Property { name: "lowerSeries"; type: "QLineSeries"; isReadonly: true; isPointer: true }
                     Property { name: "color"; type: "QColor" }
                     Property { name: "borderColor"; type: "QColor" }
                     Property { name: "pointLabelsFormat"; type: "string" }
                     Property { name: "pointLabelsVisible"; type: "bool" }
                     Property { name: "pointLabelsFont"; type: "QFont" }
                     Property { name: "pointLabelsColor"; type: "QColor" }
                     Signal {
                         name: "clicked"
                         Parameter { name: "point"; type: "QPointF" }
                     }
                     Signal {
                         name: "hovered"
                         Parameter { name: "point"; type: "QPointF" }
                         Parameter { name: "state"; type: "bool" }
                     }
                     Signal {
                         name: "pressed"
                         Parameter { name: "point"; type: "QPointF" }
                     }
                     Signal {
                         name: "released"
                         Parameter { name: "point"; type: "QPointF" }
                     }
                     Signal {
                         name: "doubleClicked"
                         Parameter { name: "point"; type: "QPointF" }
                     }
                     Signal { name: "selected" }
                     Signal {
                         name: "colorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                     Signal {
                         name: "borderColorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                     Signal {
                         name: "pointLabelsFormatChanged"
                         Parameter { name: "format"; type: "string" }
                     }
                     Signal {
                         name: "pointLabelsVisibilityChanged"
                         Parameter { name: "visible"; type: "bool" }
                     }
                     Signal {
                         name: "pointLabelsFontChanged"
                         Parameter { name: "font"; type: "QFont" }
                     }
                     Signal {
                         name: "pointLabelsColorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                 }
                 Component {
                     name: "QtCharts::QBarCategoryAxis"
                     prototype: "QtCharts::QAbstractAxis"
                     exports: [
                         "QtCharts/BarCategoriesAxis 1.0",
                         "QtCharts/BarCategoryAxis 1.1",
                         "QtCharts/BarCategoryAxis 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 0, 0]
                     Property { name: "categories"; type: "QStringList" }
                     Property { name: "min"; type: "string" }
                     Property { name: "max"; type: "string" }
                     Property { name: "count"; type: "int"; isReadonly: true }
                     Signal {
                         name: "minChanged"
                         Parameter { name: "min"; type: "string" }
                     }
                     Signal {
                         name: "maxChanged"
                         Parameter { name: "max"; type: "string" }
                     }
                     Signal {
                         name: "rangeChanged"
                         Parameter { name: "min"; type: "string" }
                         Parameter { name: "max"; type: "string" }
                     }
                     Method { name: "clear" }
                 }
                 Component {
                     name: "QtCharts::QBarModelMapper"
                     prototype: "QObject"
                     exports: [
                         "QtCharts/BarModelMapper 1.0",
                         "QtCharts/BarModelMapper 2.0"
                     ]
                     isCreatable: false
                     exportMetaObjectRevisions: [0, 0]
                 }
                 Component { name: "QtCharts::QBarSeries"; prototype: "QtCharts::QAbstractBarSeries" }
                 Component {
                     name: "QtCharts::QBarSet"
                     prototype: "QObject"
                     exports: ["QtCharts/BarSetBase 1.0", "QtCharts/BarSetBase 2.0"]
                     isCreatable: false
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "label"; type: "string" }
                     Property { name: "pen"; type: "QPen" }
                     Property { name: "brush"; type: "QBrush" }
                     Property { name: "labelBrush"; type: "QBrush" }
                     Property { name: "labelFont"; type: "QFont" }
                     Property { name: "color"; type: "QColor" }
                     Property { name: "borderColor"; type: "QColor" }
                     Property { name: "labelColor"; type: "QColor" }
                     Signal {
                         name: "clicked"
                         Parameter { name: "index"; type: "int" }
                     }
                     Signal {
                         name: "hovered"
                         Parameter { name: "status"; type: "bool" }
                         Parameter { name: "index"; type: "int" }
                     }
                     Signal {
                         name: "pressed"
                         Parameter { name: "index"; type: "int" }
                     }
                     Signal {
                         name: "released"
                         Parameter { name: "index"; type: "int" }
                     }
                     Signal {
                         name: "doubleClicked"
                         Parameter { name: "index"; type: "int" }
                     }
                     Signal {
                         name: "colorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                     Signal {
                         name: "borderColorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                     Signal {
                         name: "labelColorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                     Signal {
                         name: "valuesAdded"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "count"; type: "int" }
                     }
                     Signal {
                         name: "valuesRemoved"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "count"; type: "int" }
                     }
                     Signal {
                         name: "valueChanged"
                         Parameter { name: "index"; type: "int" }
                     }
                 }
                 Component {
                     name: "QtCharts::QBoxPlotModelMapper"
                     prototype: "QObject"
                     exports: ["QtCharts/BoxPlotModelMapper 2.0"]
                     isCreatable: false
                     exportMetaObjectRevisions: [0]
                 }
                 Component {
                     name: "QtCharts::QBoxPlotSeries"
                     prototype: "QtCharts::QAbstractSeries"
                     Property { name: "boxOutlineVisible"; type: "bool" }
                     Property { name: "boxWidth"; type: "double" }
                     Property { name: "pen"; type: "QPen" }
                     Property { name: "brush"; type: "QBrush" }
                     Property { name: "count"; revision: 1; type: "int"; isReadonly: true }
                     Signal {
                         name: "clicked"
                         Parameter { name: "boxset"; type: "QBoxSet"; isPointer: true }
                     }
                     Signal {
                         name: "hovered"
                         Parameter { name: "status"; type: "bool" }
                         Parameter { name: "boxset"; type: "QBoxSet"; isPointer: true }
                     }
                     Signal {
                         name: "pressed"
                         Parameter { name: "boxset"; type: "QBoxSet"; isPointer: true }
                     }
                     Signal {
                         name: "released"
                         Parameter { name: "boxset"; type: "QBoxSet"; isPointer: true }
                     }
                     Signal {
                         name: "doubleClicked"
                         Parameter { name: "boxset"; type: "QBoxSet"; isPointer: true }
                     }
                     Signal { name: "boxOutlineVisibilityChanged" }
                     Signal {
                         name: "boxsetsAdded"
                         Parameter { name: "sets"; type: "QList<QBoxSet*>" }
                     }
                     Signal {
                         name: "boxsetsRemoved"
                         Parameter { name: "sets"; type: "QList<QBoxSet*>" }
                     }
                 }
                 Component {
                     name: "QtCharts::QBoxSet"
                     prototype: "QObject"
                     Property { name: "pen"; type: "QPen" }
                     Property { name: "brush"; type: "QBrush" }
                     Signal { name: "clicked" }
                     Signal {
                         name: "hovered"
                         Parameter { name: "status"; type: "bool" }
                     }
                     Signal { name: "pressed" }
                     Signal { name: "released" }
                     Signal { name: "doubleClicked" }
                     Signal { name: "valuesChanged" }
                     Signal {
                         name: "valueChanged"
                         Parameter { name: "index"; type: "int" }
                     }
                     Signal { name: "cleared" }
                 }
                 Component {
                     name: "QtCharts::QCategoryAxis"
                     prototype: "QtCharts::QValueAxis"
+                    Enum {
+                        name: "AxisLabelsPosition"
+                        values: {
+                            "AxisLabelsPositionCenter": 0,
+                            "AxisLabelsPositionOnValue": 1
+                        }
+                    }
                     Property { name: "startValue"; type: "double" }
                     Property { name: "count"; type: "int"; isReadonly: true }
                     Property { name: "categoriesLabels"; type: "QStringList"; isReadonly: true }
+                    Property { name: "labelsPosition"; type: "AxisLabelsPosition" }
                     Signal { name: "categoriesChanged" }
+                    Signal {
+                        name: "labelsPositionChanged"
+                        Parameter { name: "position"; type: "QCategoryAxis::AxisLabelsPosition" }
+                    }
                 }
                 Component {
                     name: "QtCharts::QDateTimeAxis"
                     prototype: "QtCharts::QAbstractAxis"
                     exports: ["QtCharts/DateTimeAxis 1.1", "QtCharts/DateTimeAxis 2.0"]
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "tickCount"; type: "int" }
                     Property { name: "min"; type: "QDateTime" }
                     Property { name: "max"; type: "QDateTime" }
                     Property { name: "format"; type: "string" }
                     Signal {
                         name: "minChanged"
                         Parameter { name: "min"; type: "QDateTime" }
                     }
                     Signal {
                         name: "maxChanged"
                         Parameter { name: "max"; type: "QDateTime" }
                     }
                     Signal {
                         name: "rangeChanged"
                         Parameter { name: "min"; type: "QDateTime" }
                         Parameter { name: "max"; type: "QDateTime" }
                     }
                     Signal {
                         name: "formatChanged"
                         Parameter { name: "format"; type: "string" }
                     }
                     Signal {
                         name: "tickCountChanged"
                         Parameter { name: "tick"; type: "int" }
                     }
                 }
                 Component {
                     name: "QtCharts::QHBarModelMapper"
                     prototype: "QtCharts::QBarModelMapper"
                     exports: [
                         "QtCharts/HBarModelMapper 1.0",
                         "QtCharts/HBarModelMapper 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "series"; type: "QAbstractBarSeries"; isPointer: true }
                     Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
                     Property { name: "firstBarSetRow"; type: "int" }
                     Property { name: "lastBarSetRow"; type: "int" }
                     Property { name: "firstColumn"; type: "int" }
                     Property { name: "columnCount"; type: "int" }
                     Signal { name: "seriesReplaced" }
                     Signal { name: "modelReplaced" }
                 }
                 Component {
                     name: "QtCharts::QHPieModelMapper"
                     prototype: "QtCharts::QPieModelMapper"
                     exports: [
                         "QtCharts/HPieModelMapper 1.0",
                         "QtCharts/HPieModelMapper 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "series"; type: "QPieSeries"; isPointer: true }
                     Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
                     Property { name: "valuesRow"; type: "int" }
                     Property { name: "labelsRow"; type: "int" }
                     Property { name: "firstColumn"; type: "int" }
                     Property { name: "columnCount"; type: "int" }
                     Signal { name: "seriesReplaced" }
                     Signal { name: "modelReplaced" }
                 }
                 Component {
                     name: "QtCharts::QHXYModelMapper"
                     prototype: "QtCharts::QXYModelMapper"
                     exports: [
                         "QtCharts/HXYModelMapper 1.0",
                         "QtCharts/HXYModelMapper 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "series"; type: "QXYSeries"; isPointer: true }
                     Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
                     Property { name: "xRow"; type: "int" }
                     Property { name: "yRow"; type: "int" }
                     Property { name: "firstColumn"; type: "int" }
                     Property { name: "columnCount"; type: "int" }
                     Signal { name: "seriesReplaced" }
                     Signal { name: "modelReplaced" }
                 }
                 Component { name: "QtCharts::QHorizontalBarSeries"; prototype: "QtCharts::QAbstractBarSeries" }
                 Component {
                     name: "QtCharts::QHorizontalPercentBarSeries"
                     prototype: "QtCharts::QAbstractBarSeries"
                 }
                 Component {
                     name: "QtCharts::QHorizontalStackedBarSeries"
                     prototype: "QtCharts::QAbstractBarSeries"
                 }
                 Component {
                     name: "QtCharts::QLegend"
                     defaultProperty: "children"
                     prototype: "QGraphicsWidget"
                     exports: ["QtCharts/Legend 1.0", "QtCharts/Legend 2.0"]
                     isCreatable: false
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "alignment"; type: "Qt::Alignment" }
                     Property { name: "backgroundVisible"; type: "bool" }
                     Property { name: "color"; type: "QColor" }
                     Property { name: "borderColor"; type: "QColor" }
                     Property { name: "font"; type: "QFont" }
                     Property { name: "labelColor"; type: "QColor" }
                     Property { name: "reverseMarkers"; type: "bool" }
                     Signal {
                         name: "backgroundVisibleChanged"
                         Parameter { name: "visible"; type: "bool" }
                     }
                     Signal {
                         name: "colorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                     Signal {
                         name: "borderColorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                     Signal {
                         name: "fontChanged"
                         Parameter { name: "font"; type: "QFont" }
                     }
                     Signal {
                         name: "labelColorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                     Signal {
                         name: "reverseMarkersChanged"
                         Parameter { name: "reverseMarkers"; type: "bool" }
                     }
                 }
                 Component { name: "QtCharts::QLineSeries"; prototype: "QtCharts::QXYSeries" }
                 Component {
                     name: "QtCharts::QLogValueAxis"
                     prototype: "QtCharts::QAbstractAxis"
                     exports: ["QtCharts/LogValueAxis 1.3", "QtCharts/LogValueAxis 2.0"]
                     exportMetaObjectRevisions: [0, 1]
                     Property { name: "min"; type: "double" }
                     Property { name: "max"; type: "double" }
                     Property { name: "labelFormat"; type: "string" }
                     Property { name: "base"; type: "double" }
                     Signal {
                         name: "minChanged"
                         Parameter { name: "min"; type: "double" }
                     }
                     Signal {
                         name: "maxChanged"
                         Parameter { name: "max"; type: "double" }
                     }
                     Signal {
                         name: "rangeChanged"
                         Parameter { name: "min"; type: "double" }
                         Parameter { name: "max"; type: "double" }
                     }
                     Signal {
                         name: "labelFormatChanged"
                         Parameter { name: "format"; type: "string" }
                     }
                     Signal {
                         name: "baseChanged"
                         Parameter { name: "base"; type: "double" }
                     }
                 }
                 Component { name: "QtCharts::QPercentBarSeries"; prototype: "QtCharts::QAbstractBarSeries" }
                 Component {
                     name: "QtCharts::QPieModelMapper"
                     prototype: "QObject"
                     exports: [
                         "QtCharts/PieModelMapper 1.0",
                         "QtCharts/PieModelMapper 2.0"
                     ]
                     isCreatable: false
                     exportMetaObjectRevisions: [0, 0]
                 }
                 Component {
                     name: "QtCharts::QPieSeries"
                     prototype: "QtCharts::QAbstractSeries"
                     exports: ["QtCharts/QPieSeries 1.0", "QtCharts/QPieSeries 2.0"]
                     isCreatable: false
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "horizontalPosition"; type: "double" }
                     Property { name: "verticalPosition"; type: "double" }
                     Property { name: "size"; type: "double" }
                     Property { name: "startAngle"; type: "double" }
                     Property { name: "endAngle"; type: "double" }
                     Property { name: "count"; type: "int"; isReadonly: true }
                     Property { name: "sum"; type: "double"; isReadonly: true }
                     Property { name: "holeSize"; type: "double" }
                     Signal {
                         name: "added"
                         Parameter { name: "slices"; type: "QList<QPieSlice*>" }
                     }
                     Signal {
                         name: "removed"
                         Parameter { name: "slices"; type: "QList<QPieSlice*>" }
                     }
                     Signal {
                         name: "clicked"
                         Parameter { name: "slice"; type: "QPieSlice"; isPointer: true }
                     }
                     Signal {
                         name: "hovered"
                         Parameter { name: "slice"; type: "QPieSlice"; isPointer: true }
                         Parameter { name: "state"; type: "bool" }
                     }
                     Signal {
                         name: "pressed"
                         Parameter { name: "slice"; type: "QPieSlice"; isPointer: true }
                     }
                     Signal {
                         name: "released"
                         Parameter { name: "slice"; type: "QPieSlice"; isPointer: true }
                     }
                     Signal {
                         name: "doubleClicked"
                         Parameter { name: "slice"; type: "QPieSlice"; isPointer: true }
                     }
                 }
                 Component {
                     name: "QtCharts::QPieSlice"
                     prototype: "QObject"
                     exports: ["QtCharts/PieSlice 1.0", "QtCharts/PieSlice 2.0"]
                     exportMetaObjectRevisions: [0, 0]
                     Enum {
                         name: "LabelPosition"
                         values: {
                             "LabelOutside": 0,
                             "LabelInsideHorizontal": 1,
                             "LabelInsideTangential": 2,
                             "LabelInsideNormal": 3
                         }
                     }
                     Property { name: "label"; type: "string" }
                     Property { name: "value"; type: "double" }
                     Property { name: "labelVisible"; type: "bool" }
                     Property { name: "labelPosition"; type: "LabelPosition" }
                     Property { name: "exploded"; type: "bool" }
                     Property { name: "pen"; type: "QPen" }
                     Property { name: "borderColor"; type: "QColor" }
                     Property { name: "borderWidth"; type: "int" }
                     Property { name: "brush"; type: "QBrush" }
                     Property { name: "color"; type: "QColor" }
                     Property { name: "labelBrush"; type: "QBrush" }
                     Property { name: "labelColor"; type: "QColor" }
                     Property { name: "labelFont"; type: "QFont" }
                     Property { name: "labelArmLengthFactor"; type: "double" }
                     Property { name: "explodeDistanceFactor"; type: "double" }
                     Property { name: "percentage"; type: "double"; isReadonly: true }
                     Property { name: "startAngle"; type: "double"; isReadonly: true }
                     Property { name: "angleSpan"; type: "double"; isReadonly: true }
                     Signal { name: "clicked" }
                     Signal {
                         name: "hovered"
                         Parameter { name: "state"; type: "bool" }
                     }
                     Signal { name: "pressed" }
                     Signal { name: "released" }
                     Signal { name: "doubleClicked" }
                 }
                 Component {
                     name: "QtCharts::QScatterSeries"
                     prototype: "QtCharts::QXYSeries"
                     Enum {
                         name: "MarkerShape"
                         values: {
                             "MarkerShapeCircle": 0,
                             "MarkerShapeRectangle": 1
                         }
                     }
                     Property { name: "color"; type: "QColor" }
                     Property { name: "borderColor"; type: "QColor" }
                     Property { name: "markerShape"; type: "MarkerShape" }
                     Property { name: "markerSize"; type: "double" }
                     Property { name: "brush"; type: "QBrush" }
                     Signal {
                         name: "colorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                     Signal {
                         name: "borderColorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                 }
                 Component { name: "QtCharts::QSplineSeries"; prototype: "QtCharts::QLineSeries" }
                 Component { name: "QtCharts::QStackedBarSeries"; prototype: "QtCharts::QAbstractBarSeries" }
                 Component {
                     name: "QtCharts::QVBarModelMapper"
                     prototype: "QtCharts::QBarModelMapper"
                     exports: [
                         "QtCharts/VBarModelMapper 1.0",
                         "QtCharts/VBarModelMapper 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "series"; type: "QAbstractBarSeries"; isPointer: true }
                     Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
                     Property { name: "firstBarSetColumn"; type: "int" }
                     Property { name: "lastBarSetColumn"; type: "int" }
                     Property { name: "firstRow"; type: "int" }
                     Property { name: "rowCount"; type: "int" }
                     Signal { name: "seriesReplaced" }
                     Signal { name: "modelReplaced" }
                 }
                 Component {
                     name: "QtCharts::QVBoxPlotModelMapper"
                     prototype: "QtCharts::QBoxPlotModelMapper"
                     exports: ["QtCharts/VBoxPlotModelMapper 2.0"]
                     exportMetaObjectRevisions: [0]
                     Property { name: "series"; type: "QBoxPlotSeries"; isPointer: true }
                     Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
                     Property { name: "firstBoxSetColumn"; type: "int" }
                     Property { name: "lastBoxSetColumn"; type: "int" }
                     Property { name: "firstRow"; type: "int" }
                     Property { name: "rowCount"; type: "int" }
                     Signal { name: "seriesReplaced" }
                     Signal { name: "modelReplaced" }
                 }
                 Component {
                     name: "QtCharts::QVPieModelMapper"
                     prototype: "QtCharts::QPieModelMapper"
                     exports: [
                         "QtCharts/VPieModelMapper 1.0",
                         "QtCharts/VPieModelMapper 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "series"; type: "QPieSeries"; isPointer: true }
                     Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
                     Property { name: "valuesColumn"; type: "int" }
                     Property { name: "labelsColumn"; type: "int" }
                     Property { name: "firstRow"; type: "int" }
                     Property { name: "rowCount"; type: "int" }
                     Signal { name: "seriesReplaced" }
                     Signal { name: "modelReplaced" }
                 }
                 Component {
                     name: "QtCharts::QVXYModelMapper"
                     prototype: "QtCharts::QXYModelMapper"
                     exports: [
                         "QtCharts/VXYModelMapper 1.0",
                         "QtCharts/VXYModelMapper 2.0"
                     ]
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "series"; type: "QXYSeries"; isPointer: true }
                     Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
                     Property { name: "xColumn"; type: "int" }
                     Property { name: "yColumn"; type: "int" }
                     Property { name: "firstRow"; type: "int" }
                     Property { name: "rowCount"; type: "int" }
                     Signal { name: "seriesReplaced" }
                     Signal { name: "modelReplaced" }
                 }
                 Component {
                     name: "QtCharts::QValueAxis"
                     prototype: "QtCharts::QAbstractAxis"
                     exports: [
                         "QtCharts/ValueAxis 1.1",
                         "QtCharts/ValueAxis 2.0",
                         "QtCharts/ValuesAxis 1.0"
                     ]
                     exportMetaObjectRevisions: [0, 0, 0]
                     Property { name: "tickCount"; type: "int" }
                     Property { name: "min"; type: "double" }
                     Property { name: "max"; type: "double" }
                     Property { name: "labelFormat"; type: "string" }
                     Signal {
                         name: "minChanged"
                         Parameter { name: "min"; type: "double" }
                     }
                     Signal {
                         name: "maxChanged"
                         Parameter { name: "max"; type: "double" }
                     }
                     Signal {
                         name: "rangeChanged"
                         Parameter { name: "min"; type: "double" }
                         Parameter { name: "max"; type: "double" }
                     }
                     Signal {
                         name: "tickCountChanged"
                         Parameter { name: "tickCount"; type: "int" }
                     }
                     Signal {
                         name: "labelFormatChanged"
                         Parameter { name: "format"; type: "string" }
                     }
                     Method { name: "applyNiceNumbers" }
                 }
                 Component {
                     name: "QtCharts::QXYModelMapper"
                     prototype: "QObject"
                     exports: ["QtCharts/XYModelMapper 1.0", "QtCharts/XYModelMapper 2.0"]
                     isCreatable: false
                     exportMetaObjectRevisions: [0, 0]
                 }
                 Component {
                     name: "QtCharts::QXYSeries"
                     prototype: "QtCharts::QAbstractSeries"
                     exports: ["QtCharts/XYSeries 1.0", "QtCharts/XYSeries 2.0"]
                     isCreatable: false
                     exportMetaObjectRevisions: [0, 0]
                     Property { name: "pointsVisible"; type: "bool" }
                     Property { name: "color"; type: "QColor" }
                     Property { name: "pointLabelsFormat"; type: "string" }
                     Property { name: "pointLabelsVisible"; type: "bool" }
                     Property { name: "pointLabelsFont"; type: "QFont" }
                     Property { name: "pointLabelsColor"; type: "QColor" }
                     Signal {
                         name: "clicked"
                         Parameter { name: "point"; type: "QPointF" }
                     }
                     Signal {
                         name: "hovered"
                         Parameter { name: "point"; type: "QPointF" }
                         Parameter { name: "state"; type: "bool" }
                     }
                     Signal {
                         name: "pressed"
                         Parameter { name: "point"; type: "QPointF" }
                     }
                     Signal {
                         name: "released"
                         Parameter { name: "point"; type: "QPointF" }
                     }
                     Signal {
                         name: "doubleClicked"
                         Parameter { name: "point"; type: "QPointF" }
                     }
                     Signal {
                         name: "pointReplaced"
                         Parameter { name: "index"; type: "int" }
                     }
                     Signal {
                         name: "pointRemoved"
                         Parameter { name: "index"; type: "int" }
                     }
                     Signal {
                         name: "pointAdded"
                         Parameter { name: "index"; type: "int" }
                     }
                     Signal {
                         name: "colorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                     Signal { name: "pointsReplaced" }
                     Signal {
                         name: "pointLabelsFormatChanged"
                         Parameter { name: "format"; type: "string" }
                     }
                     Signal {
                         name: "pointLabelsVisibilityChanged"
                         Parameter { name: "visible"; type: "bool" }
                     }
                     Signal {
                         name: "pointLabelsFontChanged"
                         Parameter { name: "font"; type: "QFont" }
                     }
                     Signal {
                         name: "pointLabelsColorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
                 }
             }

tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp +12 0

             /****************************************************************************
              **
              ** Copyright (C) 2015 The Qt Company Ltd
              ** All rights reserved.
              ** For any questions to The Qt Company, please use contact form at http://qt.io
              **
              ** This file is part of the Qt Charts module.
              **
              ** Licensees holding valid commercial license for Qt may use this file in
              ** accordance with the Qt License Agreement provided with the Software
              ** or, alternatively, in accordance with the terms contained in a written
              ** agreement between you and The Qt Company.
              **
              ** If you have questions regarding the use of this file, please use
              ** contact form at http://qt.io
              **
              ****************************************************************************/
             #include "../qabstractaxis/tst_qabstractaxis.h"
             #include <QtCharts/QCategoryAxis>
             #include <QtCharts/QLineSeries>
             class tst_QCategoryAxis: public tst_QAbstractAxis
             {
             Q_OBJECT
             public slots:
                 void initTestCase();
                 void cleanupTestCase();
                 void init();
                 void cleanup();
             private slots:
                 void qcategoryaxis_data();
                 void qcategoryaxis();
                 void max_raw_data();
                 void max_raw();
                 void max_data();
                 void max();
                 void max_animation_data();
                 void max_animation();
                 void min_raw_data();
                 void min_raw();
                 void min_data();
                 void min();
                 void min_animation_data();
                 void min_animation();
                 void range_raw_data();
                 void range_raw();
                 void range_data();
                 void range();
                 void range_animation_data();
                 void range_animation();
+                void labels_position();
                 void interval_data();
                 void interval();
             private:
                 QCategoryAxis* m_categoryaxis;
                 QLineSeries* m_series;
             };
             void tst_QCategoryAxis::initTestCase()
             {
+                qRegisterMetaType<QCategoryAxis::AxisLabelsPosition>("QCategoryAxis::AxisLabelsPosition");
             }
             void tst_QCategoryAxis::cleanupTestCase()
             {
                 QTest::qWait(1); // Allow final deleteLaters to run
             }
             void tst_QCategoryAxis::init()
             {
                 m_categoryaxis = new QCategoryAxis();
                 m_series = new QLineSeries();
                 *m_series << QPointF(-100, -100) << QPointF(0, 0) << QPointF(100, 100);
                 tst_QAbstractAxis::init(m_categoryaxis, m_series);
                 m_chart->addSeries(m_series);
                 m_chart->createDefaultAxes();
             }
             void tst_QCategoryAxis::cleanup()
             {
                 delete m_series;
                 delete m_categoryaxis;
                 m_series = 0;
                 m_categoryaxis = 0;
                 tst_QAbstractAxis::cleanup();
             }
             void tst_QCategoryAxis::qcategoryaxis_data()
             {
             }
             void tst_QCategoryAxis::qcategoryaxis()
             {
                 qabstractaxis();
                 QVERIFY(qFuzzyCompare(m_categoryaxis->max(), 0));
                 QVERIFY(qFuzzyCompare(m_categoryaxis->min(), 0));
                 QCOMPARE(m_categoryaxis->type(), QAbstractAxis::AxisTypeCategory);
+                QCOMPARE(m_categoryaxis->labelsPosition(), QCategoryAxis::AxisLabelsPositionCenter);
                 m_chart->setAxisX(m_categoryaxis, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 QVERIFY(!qFuzzyCompare(m_categoryaxis->max(), 0));
                 QVERIFY(!qFuzzyCompare(m_categoryaxis->min(), 0));
             }
             void tst_QCategoryAxis::max_raw_data()
             {
                 QTest::addColumn<qreal>("max");
                 QTest::newRow("1.0") << (qreal)1.0;
                 QTest::newRow("50.0") << (qreal)50.0;
                 QTest::newRow("101.0") << (qreal)101.0;
             }
             void tst_QCategoryAxis::max_raw()
             {
                 QFETCH(qreal, max);
                 QSignalSpy spy0(m_categoryaxis, SIGNAL(maxChanged(qreal)));
                 QSignalSpy spy1(m_categoryaxis, SIGNAL(minChanged(qreal)));
                 QSignalSpy spy2(m_categoryaxis, SIGNAL(rangeChanged(qreal,qreal)));
                 m_categoryaxis->setMax(max);
                 QVERIFY2(qFuzzyCompare(m_categoryaxis->max(), max), "Not equal");
                 QCOMPARE(spy0.count(), 1);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 1);
             }
             void tst_QCategoryAxis::max_data()
             {
                 max_raw_data();
             }
             void tst_QCategoryAxis::max()
             {
                 m_chart->setAxisX(m_categoryaxis, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 max_raw();
             }
             void tst_QCategoryAxis::max_animation_data()
             {
                 max_data();
             }
             void tst_QCategoryAxis::max_animation()
             {
                 m_chart->setAnimationOptions(QChart::GridAxisAnimations);
                 max();
             }
             void tst_QCategoryAxis::min_raw_data()
             {
                 QTest::addColumn<qreal>("min");
                 QTest::newRow("-1.0") << (qreal)-1.0;
                 QTest::newRow("-50.0") << (qreal)-50.0;
                 QTest::newRow("-101.0") << (qreal)-101.0;
             }
             void tst_QCategoryAxis::min_raw()
             {
                 QFETCH(qreal, min);
                 QSignalSpy spy0(m_categoryaxis, SIGNAL(maxChanged(qreal)));
                 QSignalSpy spy1(m_categoryaxis, SIGNAL(minChanged(qreal)));
                 QSignalSpy spy2(m_categoryaxis, SIGNAL(rangeChanged(qreal,qreal)));
                 m_categoryaxis->setMin(min);
                 QVERIFY2(qFuzzyCompare(m_categoryaxis->min(), min), "Not equal");
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 1);
                 QCOMPARE(spy2.count(), 1);
             }
             void tst_QCategoryAxis::min_data()
             {
                 min_raw_data();
             }
             void tst_QCategoryAxis::min()
             {
                 m_chart->setAxisX(m_categoryaxis, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 min_raw();
             }
             void tst_QCategoryAxis::min_animation_data()
             {
                 min_data();
             }
             void tst_QCategoryAxis::min_animation()
             {
                 m_chart->setAnimationOptions(QChart::GridAxisAnimations);
                 min();
             }
             void tst_QCategoryAxis::range_raw_data()
             {
                 QTest::addColumn<qreal>("min");
                 QTest::addColumn<qreal>("max");
                 QTest::newRow("1.0 - 101.0") << (qreal)-1.0 << (qreal)101.0;
                 QTest::newRow("25.0 - 75.0") << (qreal)25.0 << (qreal)75.0;
                 QTest::newRow("101.0") << (qreal)40.0 << (qreal)60.0;
                 QTest::newRow("-35.0 - 0.0") << (qreal)-35.0 << (qreal)10.0;
                 QTest::newRow("-35.0 - 0.0") << (qreal)-35.0 << (qreal)-15.0;
                 QTest::newRow("0.0 - 0.0") << (qreal)-0.1 << (qreal)0.1;
             }
             void tst_QCategoryAxis::range_raw()
             {
                 QFETCH(qreal, min);
                 QFETCH(qreal, max);
                 QSignalSpy spy0(m_categoryaxis, SIGNAL(maxChanged(qreal)));
                 QSignalSpy spy1(m_categoryaxis, SIGNAL(minChanged(qreal)));
                 QSignalSpy spy2(m_categoryaxis, SIGNAL(rangeChanged(qreal,qreal)));
                 m_categoryaxis->setRange(min, max);
                 QVERIFY2(qFuzzyCompare(m_categoryaxis->min(), min), "Min not equal");
                 QVERIFY2(qFuzzyCompare(m_categoryaxis->max(), max), "Max not equal");
                 QCOMPARE(spy0.count(), 1);
                 QCOMPARE(spy1.count(), 1);
                 QCOMPARE(spy2.count(), 1);
             }
             void tst_QCategoryAxis::range_data()
             {
                 range_raw_data();
             }
             void tst_QCategoryAxis::range()
             {
                 m_chart->setAxisX(m_categoryaxis, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 range_raw();
             }
             void tst_QCategoryAxis::range_animation_data()
             {
                 range_data();
             }
             void tst_QCategoryAxis::range_animation()
             {
                 m_chart->setAnimationOptions(QChart::GridAxisAnimations);
                 range();
             }
             void tst_QCategoryAxis::interval_data()
             {
                 //
             }
             void tst_QCategoryAxis::interval()
             {
                 // append one correct interval
                 m_categoryaxis->append("first", (qreal)45);
                 QCOMPARE(m_categoryaxis->startValue("first"), (qreal)0);
                 QCOMPARE(m_categoryaxis->endValue("first"), (qreal)45);
                 // append one more correct interval
                 m_categoryaxis->append("second", (qreal)75);
                 QCOMPARE(m_categoryaxis->startValue("second"), (qreal)45);
                 QCOMPARE(m_categoryaxis->endValue("second"), (qreal)75);
                 // append one incorrect interval
                 m_categoryaxis->append("third", (qreal)15);
                 QCOMPARE(m_categoryaxis->count(), 2);
                 QCOMPARE(m_categoryaxis->endValue(m_categoryaxis->categoriesLabels().last()), (qreal)75);
             //    QCOMPARE(intervalMax("first"), (qreal)75);
                 // append one more correct interval
                 m_categoryaxis->append("third", (qreal)100);
                 QCOMPARE(m_categoryaxis->count(), 3);
                 QCOMPARE(m_categoryaxis->startValue("third"), (qreal)75);
                 QCOMPARE(m_categoryaxis->endValue("third"), (qreal)100);
                 // remove one interval
                 m_categoryaxis->remove("first");
                 QCOMPARE(m_categoryaxis->count(), 2);
                 QCOMPARE(m_categoryaxis->startValue("second"), (qreal)0); // second interval should extend to firstInterval minimum
                 QCOMPARE(m_categoryaxis->endValue("second"), (qreal)75);
                 // remove one interval
                 m_categoryaxis->replaceLabel("second", "replaced");
                 QCOMPARE(m_categoryaxis->count(), 2);
                 QCOMPARE(m_categoryaxis->startValue("replaced"), (qreal)0); // second interval should extend to firstInterval minimum
                 QCOMPARE(m_categoryaxis->endValue("replaced"), (qreal)75);
             }
+            void tst_QCategoryAxis::labels_position()
+            {
+                QSignalSpy spy(m_categoryaxis,
+                               SIGNAL(labelsPositionChanged(QCategoryAxis::AxisLabelsPosition)));
+                m_categoryaxis->setLabelsPosition(QCategoryAxis::AxisLabelsPositionOnValue);
+                QCOMPARE(m_categoryaxis->labelsPosition(), QCategoryAxis::AxisLabelsPositionOnValue);
+                QCOMPARE(spy.count(), 1);
+            }
             QTEST_MAIN(tst_QCategoryAxis)
             #include "tst_qcategoryaxis.moc"

tests/auto/qml-qtquicktest/tst_categoryaxis.qml +16 -1

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             import QtQuick 2.0
             import QtTest 1.0
-            import QtCharts 2.0
+            import QtCharts 2.1
             Rectangle {
                 width: 400
                 height: 300
                 TestCase {
                     id: tc1
                     name: "tst_qml-qtquicktest CategoryAxis"
                     when: windowShown
                     function test_minMax() {
                         compare(lineSeries1.axisX.min, 0, "AxisX min");
                         compare(lineSeries1.axisX.max, 10, "AxisX max");
                         compare(lineSeries1.axisY.min, 0, "AxisY min");
                         compare(lineSeries1.axisY.max, 10, "AxisY max");
                     }
                     function test_categories() {
                         compare(lineSeries1.axisY.startValue, 0, "AxisY start value");
                         compare(lineSeries1.axisY.count, 3, "AxisY count");
                         compare(lineSeries1.axisY.categoriesLabels[0], "label0", "AxisY categories labels");
                         compare(lineSeries1.axisY.categoriesLabels[1], "label1", "AxisY categories labels");
                         compare(lineSeries1.axisY.categoriesLabels[2], "label2", "AxisY categories labels");
                     }
+                    function test_properties() {
+                        compare(lineSeries1.axisY.labelsPosition, CategoryAxis.AxisLabelsPositionCenter);
+                    }
+                    function test_signals() {
+                        axisLabelsPositionSpy.clear();
+                        lineSeries1.axisY.labelsPosition = CategoryAxis.AxisLabelsPositionOnValue;
+                        compare(axisLabelsPositionSpy.count, 1, "onLabelsPositionChanged")
+                    }
                 }
                 ChartView {
                     id: chartView
                     anchors.fill: parent
                     LineSeries {
                         id: lineSeries1
                         axisX: ValueAxis {
                             id: axisX
                             min: 0
                             max: 10
                         }
                         axisY: CategoryAxis {
                             id: axisY
                             min: 0
                             max: 10
                             startValue: 0
                             CategoryRange {
                                 label: "label0"
                                 endValue: 1
                             }
                             CategoryRange {
                                 label: "label1"
                                 endValue: 3
                             }
                             CategoryRange {
                                 label: "label2"
                                 endValue: 10
                             }
+                            SignalSpy {
+                                id: axisLabelsPositionSpy
+                                target: axisY
+                                signalName: "labelsPositionChanged"
+                            }
                         }
                         XYPoint { x: -1; y: -1 }
                         XYPoint { x: 0; y: 0 }
                         XYPoint { x: 5; y: 5 }
                     }
                 }
             }

tests/auto/qml/tst_qml.cpp +9 0

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #include <QtTest/QtTest>
             #include <QtQml/QQmlEngine>
             #include <QtQml/QQmlComponent>
             #include "tst_definitions.h"
             class tst_qml : public QObject
             {
                 Q_OBJECT
             public slots:
                 void initTestCase();
                 void cleanupTestCase();
                 void init();
                 void cleanup();
             private slots:
                 void checkPlugin_data();
                 void checkPlugin();
             private:
                 QString componentErrors(const QQmlComponent* component) const;
                 QString imports_1_1();
                 QString imports_1_3();
                 QString imports_1_4();
                 QString imports_2_0();
+                QString imports_2_1();
             };
             QString tst_qml::componentErrors(const QQmlComponent* component) const
             {
                 Q_ASSERT(component);
                 QStringList errors;
                 foreach (QQmlError const& error, component->errors()) {
                     errors  << error.toString();
                 }
                 return errors.join("\n");
             }
             QString tst_qml::imports_1_1()
             {
                 return "import QtQuick 2.0 \n"
                        "import QtCharts 1.1 \n";
             }
             QString tst_qml::imports_1_3()
             {
                 return "import QtQuick 2.0 \n"
                        "import QtCharts 1.3 \n";
             }
             QString tst_qml::imports_1_4()
             {
                 return "import QtQuick 2.0 \n"
                        "import QtCharts 1.4 \n";
             }
             QString tst_qml::imports_2_0()
             {
                 return "import QtQuick 2.0 \n"
                        "import QtCharts 2.0 \n";
             }
+            QString tst_qml::imports_2_1()
+            {
+                return "import QtQuick 2.1 \n"
+                       "import QtCharts 2.1 \n";
+            }
             void tst_qml::initTestCase()
             {
             }
             void tst_qml::cleanupTestCase()
             {
             }
             void tst_qml::init()
             {
             }
             void tst_qml::cleanup()
             {
             }
             void tst_qml::checkPlugin_data()
             {
                 QTest::addColumn<QString>("source");
                 QTest::newRow("createChartView") <<  imports_1_1() + "ChartView{}";
                 QTest::newRow("XYPoint") << imports_1_1() + "XYPoint{}";
                 QTest::newRow("scatterSeries") <<  imports_1_1() + "ScatterSeries{}";
                 QTest::newRow("lineSeries") <<  imports_1_1() + "LineSeries{}";
                 QTest::newRow("splineSeries") <<  imports_1_1() + "SplineSeries{}";
                 QTest::newRow("areaSeries") <<  imports_1_1() + "AreaSeries{}";
                 QTest::newRow("barSeries") << imports_1_1() + "BarSeries{}";
                 QTest::newRow("stackedBarSeries") << imports_1_1() + "StackedBarSeries{}";
                 QTest::newRow("precentBarSeries") << imports_1_1() + "PercentBarSeries{}";
                 QTest::newRow("horizonatlBarSeries") << imports_1_1() + "HorizontalBarSeries{}";
                 QTest::newRow("horizonatlStackedBarSeries") << imports_1_1() + "HorizontalStackedBarSeries{}";
                 QTest::newRow("horizonatlstackedBarSeries") << imports_1_1() + "HorizontalPercentBarSeries{}";
                 QTest::newRow("pieSeries") << imports_1_1() + "PieSeries{}";
                 QTest::newRow("PieSlice") << imports_1_1() + "PieSlice{}";
                 QTest::newRow("BarSet") << imports_1_1() + "BarSet{}";
                 QTest::newRow("HXYModelMapper") << imports_1_1() + "HXYModelMapper{}";
                 QTest::newRow("VXYModelMapper") << imports_1_1() + "VXYModelMapper{}";
                 QTest::newRow("HPieModelMapper") << imports_1_1() + "HPieModelMapper{}";
                 QTest::newRow("HPieModelMapper") << imports_1_1() + "HPieModelMapper{}";
                 QTest::newRow("HBarModelMapper") << imports_1_1() + "HBarModelMapper{}";
                 QTest::newRow("VBarModelMapper") << imports_1_1() + "VBarModelMapper{}";
                 QTest::newRow("ValueAxis") << imports_1_1() + "ValueAxis{}";
             #ifndef QT_ON_ARM
                 QTest::newRow("DateTimeAxis") << imports_1_1() + "DateTimeAxis{}";
             #endif
                 QTest::newRow("CategoryAxis") << imports_1_1() + "CategoryAxis{}";
                 QTest::newRow("CategoryRange") << imports_1_1() + "CategoryRange{}";
                 QTest::newRow("BarCategoryAxis") << imports_1_1() + "BarCategoryAxis{}";
                 QTest::newRow("createPolarChartView") <<  imports_1_3() + "PolarChartView{}";
                 QTest::newRow("LogValueAxis") <<  imports_1_3() + "LogValueAxis{}";
                 QTest::newRow("BoxPlotSeries") <<  imports_1_3() + "BoxPlotSeries{}";
                 QTest::newRow("BoxSet") <<  imports_1_3() + "BoxSet{}";
                 QTest::newRow("createChartView_2_0") <<  imports_2_0() + "ChartView{}";
                 QTest::newRow("XYPoint_2_0") << imports_2_0() + "XYPoint{}";
                 QTest::newRow("scatterSeries_2_0") <<  imports_2_0() + "ScatterSeries{}";
                 QTest::newRow("lineSeries_2_0") <<  imports_2_0() + "LineSeries{}";
                 QTest::newRow("splineSeries_2_0") <<  imports_2_0() + "SplineSeries{}";
                 QTest::newRow("areaSeries_2_0") <<  imports_2_0() + "AreaSeries{}";
                 QTest::newRow("barSeries_2_0") << imports_2_0() + "BarSeries{}";
                 QTest::newRow("stackedBarSeries_2_0") << imports_2_0() + "StackedBarSeries{}";
                 QTest::newRow("precentBarSeries_2_0") << imports_2_0() + "PercentBarSeries{}";
                 QTest::newRow("horizonatlBarSeries_2_0") << imports_2_0() + "HorizontalBarSeries{}";
                 QTest::newRow("horizonatlStackedBarSeries_2_0")
                         << imports_2_0() + "HorizontalStackedBarSeries{}";
                 QTest::newRow("horizonatlstackedBarSeries_2_0")
                         << imports_2_0() + "HorizontalPercentBarSeries{}";
                 QTest::newRow("pieSeries_2_0") << imports_2_0() + "PieSeries{}";
                 QTest::newRow("PieSlice_2_0") << imports_2_0() + "PieSlice{}";
                 QTest::newRow("BarSet_2_0") << imports_2_0() + "BarSet{}";
                 QTest::newRow("HXYModelMapper_2_0") << imports_2_0() + "HXYModelMapper{}";
                 QTest::newRow("VXYModelMapper_2_0") << imports_2_0() + "VXYModelMapper{}";
                 QTest::newRow("HPieModelMapper_2_0") << imports_2_0() + "HPieModelMapper{}";
                 QTest::newRow("HPieModelMapper_2_0") << imports_2_0() + "HPieModelMapper{}";
                 QTest::newRow("HBarModelMapper_2_0") << imports_2_0() + "HBarModelMapper{}";
                 QTest::newRow("VBarModelMapper_2_0") << imports_2_0() + "VBarModelMapper{}";
                 QTest::newRow("ValueAxis_2_0") << imports_2_0() + "ValueAxis{}";
             #ifndef QT_ON_ARM
                 QTest::newRow("DateTimeAxis_2_0") << imports_2_0() + "DateTimeAxis{}";
             #endif
                 QTest::newRow("CategoryAxis_2_0") << imports_2_0() + "CategoryAxis{}";
                 QTest::newRow("CategoryRange_2_0") << imports_2_0() + "CategoryRange{}";
                 QTest::newRow("BarCategoryAxis_2_0") << imports_2_0() + "BarCategoryAxis{}";
                 QTest::newRow("createPolarChartView_2_0") <<  imports_2_0() + "PolarChartView{}";
                 QTest::newRow("LogValueAxis_2_0") <<  imports_2_0() + "LogValueAxis{}";
                 QTest::newRow("BoxPlotSeries_2_0") <<  imports_2_0() + "BoxPlotSeries{}";
                 QTest::newRow("BoxSet_2_0") <<  imports_2_0() + "BoxSet{}";
+                QTest::newRow("CategoryAxis") << imports_2_1() + "CategoryAxis{}";
             }
             void tst_qml::checkPlugin()
             {
                 QFETCH(QString, source);
                 QQmlEngine engine;
                 engine.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("qml")));
                 QQmlComponent component(&engine);
                 component.setData(source.toLatin1(), QUrl());
                 QVERIFY2(!component.isError(), qPrintable(componentErrors(&component)));
                 TRY_COMPARE(component.status(), QQmlComponent::Ready);
                 QObject *obj = component.create();
                 QVERIFY(obj != 0);
                 delete obj;
             }
             QTEST_MAIN(tst_qml)
             #include "tst_qml.moc"

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages