Add QVBoxPlotModelMapper and QBoxPlotModelMapper as types for QtQuick 2

Change-Id: I2683c981acee51d9929234d79e7da100cfc6a608
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>

2 files changed, 45 insertions, 1 deletions

diff --git a/plugins/declarative/plugin.cpp b/plugins/declarative/plugin.cpp
index 547d035a..9fc4760c 100644
--- a/plugins/declarative/plugin.cpp
+++ b/plugins/declarative/plugin.cpp
@@ -46,6 +46,8 @@
 #include "qbarlegendmarker.h"
 #include "qpielegendmarker.h"
 #include "qxylegendmarker.h"
+#include "qboxplotmodelmapper.h"
+#include "qvboxplotmodelmapper.h"
 #ifndef QT_ON_ARM
     #include "qdatetimeaxis.h"
 #endif
@@ -103,6 +105,9 @@ Q_DECLARE_METATYPE(QVPieModelMapper *)
 Q_DECLARE_METATYPE(QVXYModelMapper *)
 Q_DECLARE_METATYPE(QXYLegendMarker *)
 Q_DECLARE_METATYPE(QXYModelMapper *)
+Q_DECLARE_METATYPE(QBoxPlotModelMapper *)
+Q_DECLARE_METATYPE(QVBoxPlotModelMapper *)
+
 
 Q_DECLARE_METATYPE(QAbstractSeries *)
 Q_DECLARE_METATYPE(QXYSeries *)
@@ -165,6 +170,7 @@ public:
         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",
@@ -247,6 +253,11 @@ public:
         qmlRegisterType<DeclarativeBoxSet, 1>(uri, 1, 4, "BoxSet");
         qmlRegisterType<DeclarativePieSlice>(uri, 1, 4, "PieSlice");
         qmlRegisterType<DeclarativeScatterSeries, 4>(uri, 1, 4, "ScatterSeries");
+
+        // QtCommercial.Chart 2.0
+        qmlRegisterType<QVBoxPlotModelMapper>(uri, 2, 0, "VBoxPlotModelMapper");
+        qmlRegisterUncreatableType<QBoxPlotModelMapper>(uri, 2, 0, "BoxPlotModelMapper",
+            QLatin1String("Trying to create uncreatable: BoxPlotModelMapper."));
     }
 };
 
diff --git a/plugins/quick2/plugins.qmltypes b/plugins/quick2/plugins.qmltypes
index 2dc27f0a..d7ad34a6 100644
--- a/plugins/quick2/plugins.qmltypes
+++ b/plugins/quick2/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtCommercial.Chart 1.4'
+// 'qmlplugindump -nonrelocatable QtCommercial.Chart 2.0'
 
 Module {
     Component {
@@ -119,6 +119,7 @@ Module {
         name: "QtCommercialChart::DeclarativeAxes"
         prototype: "QObject"
         exports: ["QtCommercial.Chart/DeclarativeAxes 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Property { name: "axisX"; type: "QAbstractAxis"; isPointer: true }
         Property { name: "axisY"; type: "QAbstractAxis"; isPointer: true }
@@ -948,6 +949,7 @@ Module {
         name: "QtCommercialChart::DeclarativeMargins"
         prototype: "QObject"
         exports: ["QtCommercial.Chart/Margins 1.1"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Property { name: "top"; type: "int" }
         Property { name: "bottom"; type: "int" }
@@ -1442,6 +1444,7 @@ Module {
         name: "QtCommercialChart::QAbstractAxis"
         prototype: "QObject"
         exports: ["QtCommercial.Chart/AbstractAxis 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Property { name: "visible"; type: "bool" }
         Property { name: "lineVisible"; type: "bool" }
@@ -1560,6 +1563,7 @@ Module {
         name: "QtCommercialChart::QAbstractBarSeries"
         prototype: "QtCommercialChart::QAbstractSeries"
         exports: ["QtCommercial.Chart/AbstractBarSeries 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Enum {
             name: "LabelsPosition"
@@ -1612,6 +1616,7 @@ Module {
         name: "QtCommercialChart::QAbstractSeries"
         prototype: "QObject"
         exports: ["QtCommercial.Chart/AbstractSeries 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Enum {
             name: "SeriesType"
@@ -1712,6 +1717,7 @@ Module {
         name: "QtCommercialChart::QBarModelMapper"
         prototype: "QObject"
         exports: ["QtCommercial.Chart/BarModelMapper 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
     }
     Component {
@@ -1722,6 +1728,7 @@ Module {
         name: "QtCommercialChart::QBarSet"
         prototype: "QObject"
         exports: ["QtCommercial.Chart/BarSetBase 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Property { name: "label"; type: "string" }
         Property { name: "pen"; type: "QPen" }
@@ -1772,6 +1779,13 @@ Module {
         }
     }
     Component {
+        name: "QtCommercialChart::QBoxPlotModelMapper"
+        prototype: "QObject"
+        exports: ["QtCommercial.Chart/BoxPlotModelMapper 2.0"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
         name: "QtCommercialChart::QBoxPlotSeries"
         prototype: "QtCommercialChart::QAbstractSeries"
         Property { name: "boxOutlineVisible"; type: "bool" }
@@ -1913,6 +1927,7 @@ Module {
         defaultProperty: "children"
         prototype: "QGraphicsWidget"
         exports: ["QtCommercial.Chart/Legend 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Property { name: "alignment"; type: "Qt::Alignment" }
         Property { name: "backgroundVisible"; type: "bool" }
@@ -1986,12 +2001,14 @@ Module {
         name: "QtCommercialChart::QPieModelMapper"
         prototype: "QObject"
         exports: ["QtCommercial.Chart/PieModelMapper 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QtCommercialChart::QPieSeries"
         prototype: "QtCommercialChart::QAbstractSeries"
         exports: ["QtCommercial.Chart/QPieSeries 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Property { name: "horizontalPosition"; type: "double" }
         Property { name: "verticalPosition"; type: "double" }
@@ -2104,6 +2121,20 @@ Module {
         Signal { name: "modelReplaced" }
     }
     Component {
+        name: "QtCommercialChart::QVBoxPlotModelMapper"
+        prototype: "QtCommercialChart::QBoxPlotModelMapper"
+        exports: ["QtCommercial.Chart/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: "QtCommercialChart::QVPieModelMapper"
         prototype: "QtCommercialChart::QPieModelMapper"
         exports: ["QtCommercial.Chart/VPieModelMapper 1.0"]
@@ -2171,12 +2202,14 @@ Module {
         name: "QtCommercialChart::QXYModelMapper"
         prototype: "QObject"
         exports: ["QtCommercial.Chart/XYModelMapper 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QtCommercialChart::QXYSeries"
         prototype: "QtCommercialChart::QAbstractSeries"
         exports: ["QtCommercial.Chart/XYSeries 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Property { name: "pointsVisible"; type: "bool" }
         Property { name: "color"; type: "QColor" }