Modernize and update to latest CMake API

Use declarative registration for QML types, and separate the backing
library from the plugin. Also, bump the revision numbers to account for
Qt6 and drop the "2" from the source directory name.

Change-Id: Ib48f90ad32a3624e7c31f1d2af9fcd92f069ee7f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

63 files changed, 372 insertions, 2857 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0d520eca..8f9835d4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_subdirectory(datavisualization)
 if(TARGET Qt::Quick)
-    add_subdirectory(datavisualizationqml2)
+    add_subdirectory(datavisualizationqml)
 endif()
diff --git a/src/datavisualization/CMakeLists.txt b/src/datavisualization/CMakeLists.txt
index 1e4fdd09..d0607248 100644
--- a/src/datavisualization/CMakeLists.txt
+++ b/src/datavisualization/CMakeLists.txt
@@ -84,7 +84,7 @@ qt_internal_add_module(DataVisualization
         input
         theme
         utils
-        ../datavisualizationqml2
+        ../datavisualizationqml
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h
index 5837a4ed..0ff405dd 100644
--- a/src/datavisualization/axis/qabstract3daxis.h
+++ b/src/datavisualization/axis/qabstract3daxis.h
@@ -51,9 +51,9 @@ class QT_DATAVISUALIZATION_EXPORT QAbstract3DAxis : public QObject
     Q_PROPERTY(float min READ min WRITE setMin NOTIFY minChanged)
     Q_PROPERTY(float max READ max WRITE setMax NOTIFY maxChanged)
     Q_PROPERTY(bool autoAdjustRange READ isAutoAdjustRange WRITE setAutoAdjustRange NOTIFY autoAdjustRangeChanged)
-    Q_PROPERTY(float labelAutoRotation READ labelAutoRotation WRITE setLabelAutoRotation NOTIFY labelAutoRotationChanged REVISION 1)
-    Q_PROPERTY(bool titleVisible READ isTitleVisible WRITE setTitleVisible NOTIFY titleVisibilityChanged REVISION 1)
-    Q_PROPERTY(bool titleFixed READ isTitleFixed WRITE setTitleFixed NOTIFY titleFixedChanged REVISION 1)
+    Q_PROPERTY(float labelAutoRotation READ labelAutoRotation WRITE setLabelAutoRotation NOTIFY labelAutoRotationChanged REVISION(1, 1))
+    Q_PROPERTY(bool titleVisible READ isTitleVisible WRITE setTitleVisible NOTIFY titleVisibilityChanged REVISION(1, 1))
+    Q_PROPERTY(bool titleFixed READ isTitleFixed WRITE setTitleFixed NOTIFY titleFixedChanged REVISION(1, 1))
 
 public:
     enum AxisOrientation {
@@ -112,9 +112,9 @@ Q_SIGNALS:
     void maxChanged(float value);
     void rangeChanged(float min, float max);
     void autoAdjustRangeChanged(bool autoAdjust);
-    Q_REVISION(1) void labelAutoRotationChanged(float angle);
-    Q_REVISION(1) void titleVisibilityChanged(bool visible);
-    Q_REVISION(1) void titleFixedChanged(bool fixed);
+    Q_REVISION(1, 1) void labelAutoRotationChanged(float angle);
+    Q_REVISION(1, 1) void titleVisibilityChanged(bool visible);
+    Q_REVISION(1, 1) void titleFixedChanged(bool fixed);
 
 protected:
     QScopedPointer<QAbstract3DAxisPrivate> d_ptr;
diff --git a/src/datavisualization/axis/qvalue3daxis.h b/src/datavisualization/axis/qvalue3daxis.h
index 80942e43..b1fce675 100644
--- a/src/datavisualization/axis/qvalue3daxis.h
+++ b/src/datavisualization/axis/qvalue3daxis.h
@@ -43,8 +43,8 @@ class QT_DATAVISUALIZATION_EXPORT QValue3DAxis : public QAbstract3DAxis
     Q_PROPERTY(int segmentCount READ segmentCount WRITE setSegmentCount NOTIFY segmentCountChanged)
     Q_PROPERTY(int subSegmentCount READ subSegmentCount WRITE setSubSegmentCount NOTIFY subSegmentCountChanged)
     Q_PROPERTY(QString labelFormat READ labelFormat WRITE setLabelFormat NOTIFY labelFormatChanged)
-    Q_PROPERTY(QValue3DAxisFormatter* formatter READ formatter WRITE setFormatter NOTIFY formatterChanged REVISION 1)
-    Q_PROPERTY(bool reversed READ reversed WRITE setReversed NOTIFY reversedChanged REVISION 1)
+    Q_PROPERTY(QValue3DAxisFormatter* formatter READ formatter WRITE setFormatter NOTIFY formatterChanged REVISION(1, 1))
+    Q_PROPERTY(bool reversed READ reversed WRITE setReversed NOTIFY reversedChanged REVISION(1, 1))
 
 public:
     explicit QValue3DAxis(QObject *parent = nullptr);
@@ -69,8 +69,8 @@ Q_SIGNALS:
     void segmentCountChanged(int count);
     void subSegmentCountChanged(int count);
     void labelFormatChanged(const QString &format);
-    Q_REVISION(1) void formatterChanged(QValue3DAxisFormatter *formatter);
-    Q_REVISION(1) void reversedChanged(bool enable);
+    Q_REVISION(1, 1) void formatterChanged(QValue3DAxisFormatter *formatter);
+    Q_REVISION(1, 1) void reversedChanged(bool enable);
 
 protected:
     QValue3DAxisPrivate *dptr();
diff --git a/src/datavisualization/data/abstractrenderitem_p.h b/src/datavisualization/data/abstractrenderitem_p.h
index 3c413a7b..e95077e5 100644
--- a/src/datavisualization/data/abstractrenderitem_p.h
+++ b/src/datavisualization/data/abstractrenderitem_p.h
@@ -40,8 +40,8 @@
 #ifndef ABSTRACTRENDERITEM_P_H
 #define ABSTRACTRENDERITEM_P_H
 
-#include "datavisualizationglobal_p.h"
-#include "labelitem_p.h"
+#include <private/datavisualizationglobal_p.h>
+#include <private/labelitem_p.h>
 
 #include <QtGui/QVector3D>
 #include <QtGui/QQuaternion>
diff --git a/src/datavisualization/data/labelitem_p.h b/src/datavisualization/data/labelitem_p.h
index 3b634496..c090c9c0 100644
--- a/src/datavisualization/data/labelitem_p.h
+++ b/src/datavisualization/data/labelitem_p.h
@@ -40,7 +40,7 @@
 #ifndef LABELITEM_P_H
 #define LABELITEM_P_H
 
-#include "datavisualizationglobal_p.h"
+#include <private/datavisualizationglobal_p.h>
 #include <QtCore/QSize>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h
index 3114639f..c9f355e1 100644
--- a/src/datavisualization/data/qabstract3dseries.h
+++ b/src/datavisualization/data/qabstract3dseries.h
@@ -61,8 +61,8 @@ class QT_DATAVISUALIZATION_EXPORT QAbstract3DSeries : public QObject
     Q_PROPERTY(QColor multiHighlightColor READ multiHighlightColor WRITE setMultiHighlightColor NOTIFY multiHighlightColorChanged)
     Q_PROPERTY(QLinearGradient multiHighlightGradient READ multiHighlightGradient WRITE setMultiHighlightGradient NOTIFY multiHighlightGradientChanged)
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
-    Q_PROPERTY(QString itemLabel READ itemLabel NOTIFY itemLabelChanged REVISION 1)
-    Q_PROPERTY(bool itemLabelVisible READ isItemLabelVisible WRITE setItemLabelVisible NOTIFY itemLabelVisibilityChanged REVISION 1)
+    Q_PROPERTY(QString itemLabel READ itemLabel NOTIFY itemLabelChanged REVISION(1, 1))
+    Q_PROPERTY(bool itemLabelVisible READ isItemLabelVisible WRITE setItemLabelVisible NOTIFY itemLabelVisibilityChanged REVISION(1, 1))
 
 public:
     enum SeriesType {
@@ -151,8 +151,8 @@ Q_SIGNALS:
     void multiHighlightColorChanged(const QColor &color);
     void multiHighlightGradientChanged(const QLinearGradient &gradient);
     void nameChanged(const QString &name);
-    Q_REVISION(1) void itemLabelChanged(const QString &label);
-    Q_REVISION(1) void itemLabelVisibilityChanged(bool visible);
+    Q_REVISION(1, 1) void itemLabelChanged(const QString &label);
+    Q_REVISION(1, 1) void itemLabelVisibilityChanged(bool visible);
 
 protected:
     QScopedPointer<QAbstract3DSeriesPrivate> d_ptr;
diff --git a/src/datavisualization/data/qcustom3ditem.h b/src/datavisualization/data/qcustom3ditem.h
index d16bd377..8d6d905f 100644
--- a/src/datavisualization/data/qcustom3ditem.h
+++ b/src/datavisualization/data/qcustom3ditem.h
@@ -50,7 +50,7 @@ class QT_DATAVISUALIZATION_EXPORT QCustom3DItem : public QObject
     Q_PROPERTY(QQuaternion rotation READ rotation WRITE setRotation NOTIFY rotationChanged)
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
     Q_PROPERTY(bool shadowCasting READ isShadowCasting WRITE setShadowCasting NOTIFY shadowCastingChanged)
-    Q_PROPERTY(bool scalingAbsolute READ isScalingAbsolute WRITE setScalingAbsolute NOTIFY scalingAbsoluteChanged REVISION 1)
+    Q_PROPERTY(bool scalingAbsolute READ isScalingAbsolute WRITE setScalingAbsolute NOTIFY scalingAbsoluteChanged REVISION(1, 2))
 
 public:
     explicit QCustom3DItem(QObject *parent = nullptr);
@@ -99,7 +99,7 @@ Q_SIGNALS:
     void rotationChanged(const QQuaternion &rotation);
     void visibleChanged(bool visible);
     void shadowCastingChanged(bool shadowCasting);
-    Q_REVISION(1) void scalingAbsoluteChanged(bool scalingAbsolute);
+    Q_REVISION(1, 2) void scalingAbsoluteChanged(bool scalingAbsolute);
 
 protected:
     QCustom3DItem(QCustom3DItemPrivate *d, QObject *parent = nullptr);
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h
index 90f14f6b..501d77fe 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy.h
@@ -52,15 +52,15 @@ class QT_DATAVISUALIZATION_EXPORT QItemModelBarDataProxy : public QBarDataProxy
     Q_PROPERTY(bool useModelCategories READ useModelCategories WRITE setUseModelCategories NOTIFY useModelCategoriesChanged)
     Q_PROPERTY(bool autoRowCategories READ autoRowCategories WRITE setAutoRowCategories NOTIFY autoRowCategoriesChanged)
     Q_PROPERTY(bool autoColumnCategories READ autoColumnCategories WRITE setAutoColumnCategories NOTIFY autoColumnCategoriesChanged)
-    Q_PROPERTY(QRegularExpression rowRolePattern READ rowRolePattern WRITE setRowRolePattern NOTIFY rowRolePatternChanged REVISION 1)
-    Q_PROPERTY(QRegularExpression columnRolePattern READ columnRolePattern WRITE setColumnRolePattern NOTIFY columnRolePatternChanged REVISION 1)
-    Q_PROPERTY(QRegularExpression valueRolePattern READ valueRolePattern WRITE setValueRolePattern NOTIFY valueRolePatternChanged REVISION 1)
-    Q_PROPERTY(QRegularExpression rotationRolePattern READ rotationRolePattern WRITE setRotationRolePattern NOTIFY rotationRolePatternChanged REVISION 1)
-    Q_PROPERTY(QString rowRoleReplace READ rowRoleReplace WRITE setRowRoleReplace NOTIFY rowRoleReplaceChanged REVISION 1)
-    Q_PROPERTY(QString columnRoleReplace READ columnRoleReplace WRITE setColumnRoleReplace NOTIFY columnRoleReplaceChanged REVISION 1)
-    Q_PROPERTY(QString valueRoleReplace READ valueRoleReplace WRITE setValueRoleReplace NOTIFY valueRoleReplaceChanged REVISION 1)
-    Q_PROPERTY(QString rotationRoleReplace READ rotationRoleReplace WRITE setRotationRoleReplace NOTIFY rotationRoleReplaceChanged REVISION 1)
-    Q_PROPERTY(MultiMatchBehavior multiMatchBehavior READ multiMatchBehavior WRITE setMultiMatchBehavior NOTIFY multiMatchBehaviorChanged REVISION 1)
+    Q_PROPERTY(QRegularExpression rowRolePattern READ rowRolePattern WRITE setRowRolePattern NOTIFY rowRolePatternChanged REVISION(1, 1))
+    Q_PROPERTY(QRegularExpression columnRolePattern READ columnRolePattern WRITE setColumnRolePattern NOTIFY columnRolePatternChanged REVISION(1, 1))
+    Q_PROPERTY(QRegularExpression valueRolePattern READ valueRolePattern WRITE setValueRolePattern NOTIFY valueRolePatternChanged REVISION(1, 1))
+    Q_PROPERTY(QRegularExpression rotationRolePattern READ rotationRolePattern WRITE setRotationRolePattern NOTIFY rotationRolePatternChanged REVISION(1, 1))
+    Q_PROPERTY(QString rowRoleReplace READ rowRoleReplace WRITE setRowRoleReplace NOTIFY rowRoleReplaceChanged REVISION(1, 1))
+    Q_PROPERTY(QString columnRoleReplace READ columnRoleReplace WRITE setColumnRoleReplace NOTIFY columnRoleReplaceChanged REVISION(1, 1))
+    Q_PROPERTY(QString valueRoleReplace READ valueRoleReplace WRITE setValueRoleReplace NOTIFY valueRoleReplaceChanged REVISION(1, 1))
+    Q_PROPERTY(QString rotationRoleReplace READ rotationRoleReplace WRITE setRotationRoleReplace NOTIFY rotationRoleReplaceChanged REVISION(1, 1))
+    Q_PROPERTY(MultiMatchBehavior multiMatchBehavior READ multiMatchBehavior WRITE setMultiMatchBehavior NOTIFY multiMatchBehaviorChanged REVISION(1, 1))
 
 public:
     enum MultiMatchBehavior {
@@ -154,15 +154,15 @@ Q_SIGNALS:
     void useModelCategoriesChanged(bool enable);
     void autoRowCategoriesChanged(bool enable);
     void autoColumnCategoriesChanged(bool enable);
-    Q_REVISION(1) void rowRolePatternChanged(const QRegularExpression &pattern);
-    Q_REVISION(1) void columnRolePatternChanged(const QRegularExpression &pattern);
-    Q_REVISION(1) void valueRolePatternChanged(const QRegularExpression &pattern);
-    Q_REVISION(1) void rotationRolePatternChanged(const QRegularExpression &pattern);
-    Q_REVISION(1) void rowRoleReplaceChanged(const QString &replace);
-    Q_REVISION(1) void columnRoleReplaceChanged(const QString &replace);
-    Q_REVISION(1) void valueRoleReplaceChanged(const QString &replace);
-    Q_REVISION(1) void rotationRoleReplaceChanged(const QString &replace);
-    Q_REVISION(1) void multiMatchBehaviorChanged(MultiMatchBehavior behavior);
+    Q_REVISION(1, 1) void rowRolePatternChanged(const QRegularExpression &pattern);
+    Q_REVISION(1, 1) void columnRolePatternChanged(const QRegularExpression &pattern);
+    Q_REVISION(1, 1) void valueRolePatternChanged(const QRegularExpression &pattern);
+    Q_REVISION(1, 1) void rotationRolePatternChanged(const QRegularExpression &pattern);
+    Q_REVISION(1, 1) void rowRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1, 1) void columnRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1, 1) void valueRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1, 1) void rotationRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1, 1) void multiMatchBehaviorChanged(MultiMatchBehavior behavior);
 
 protected:
     QItemModelBarDataProxyPrivate *dptr();
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h
index c0106e81..5d66b12e 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h
@@ -47,14 +47,14 @@ class QT_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDa
     Q_PROPERTY(QString yPosRole READ yPosRole WRITE setYPosRole NOTIFY yPosRoleChanged)
     Q_PROPERTY(QString zPosRole READ zPosRole WRITE setZPosRole NOTIFY zPosRoleChanged)
     Q_PROPERTY(QString rotationRole READ rotationRole WRITE setRotationRole NOTIFY rotationRoleChanged)
-    Q_PROPERTY(QRegularExpression xPosRolePattern READ xPosRolePattern WRITE setXPosRolePattern NOTIFY xPosRolePatternChanged REVISION 1)
-    Q_PROPERTY(QRegularExpression yPosRolePattern READ yPosRolePattern WRITE setYPosRolePattern NOTIFY yPosRolePatternChanged REVISION 1)
-    Q_PROPERTY(QRegularExpression zPosRolePattern READ zPosRolePattern WRITE setZPosRolePattern NOTIFY zPosRolePatternChanged REVISION 1)
-    Q_PROPERTY(QRegularExpression rotationRolePattern READ rotationRolePattern WRITE setRotationRolePattern NOTIFY rotationRolePatternChanged REVISION 1)
-    Q_PROPERTY(QString xPosRoleReplace READ xPosRoleReplace WRITE setXPosRoleReplace NOTIFY xPosRoleReplaceChanged REVISION 1)
-    Q_PROPERTY(QString yPosRoleReplace READ yPosRoleReplace WRITE setYPosRoleReplace NOTIFY yPosRoleReplaceChanged REVISION 1)
-    Q_PROPERTY(QString zPosRoleReplace READ zPosRoleReplace WRITE setZPosRoleReplace NOTIFY zPosRoleReplaceChanged REVISION 1)
-    Q_PROPERTY(QString rotationRoleReplace READ rotationRoleReplace WRITE setRotationRoleReplace NOTIFY rotationRoleReplaceChanged REVISION 1)
+    Q_PROPERTY(QRegularExpression xPosRolePattern READ xPosRolePattern WRITE setXPosRolePattern NOTIFY xPosRolePatternChanged REVISION(1, 1))
+    Q_PROPERTY(QRegularExpression yPosRolePattern READ yPosRolePattern WRITE setYPosRolePattern NOTIFY yPosRolePatternChanged REVISION(1, 1))
+    Q_PROPERTY(QRegularExpression zPosRolePattern READ zPosRolePattern WRITE setZPosRolePattern NOTIFY zPosRolePatternChanged REVISION(1, 1))
+    Q_PROPERTY(QRegularExpression rotationRolePattern READ rotationRolePattern WRITE setRotationRolePattern NOTIFY rotationRolePatternChanged REVISION(1, 1))
+    Q_PROPERTY(QString xPosRoleReplace READ xPosRoleReplace WRITE setXPosRoleReplace NOTIFY xPosRoleReplaceChanged REVISION(1, 1))
+    Q_PROPERTY(QString yPosRoleReplace READ yPosRoleReplace WRITE setYPosRoleReplace NOTIFY yPosRoleReplaceChanged REVISION(1, 1))
+    Q_PROPERTY(QString zPosRoleReplace READ zPosRoleReplace WRITE setZPosRoleReplace NOTIFY zPosRoleReplaceChanged REVISION(1, 1))
+    Q_PROPERTY(QString rotationRoleReplace READ rotationRoleReplace WRITE setRotationRoleReplace NOTIFY rotationRoleReplaceChanged REVISION(1, 1))
 
 public:
     explicit QItemModelScatterDataProxy(QObject *parent = nullptr);
@@ -107,14 +107,14 @@ Q_SIGNALS:
     void yPosRoleChanged(const QString &role);
     void zPosRoleChanged(const QString &role);
     void rotationRoleChanged(const QString &role);
-    Q_REVISION(1) void xPosRolePatternChanged(const QRegularExpression &pattern);
-    Q_REVISION(1) void yPosRolePatternChanged(const QRegularExpression &pattern);
-    Q_REVISION(1) void zPosRolePatternChanged(const QRegularExpression &pattern);
-    Q_REVISION(1) void rotationRolePatternChanged(const QRegularExpression &pattern);
-    Q_REVISION(1) void rotationRoleReplaceChanged(const QString &replace);
-    Q_REVISION(1) void xPosRoleReplaceChanged(const QString &replace);
-    Q_REVISION(1) void yPosRoleReplaceChanged(const QString &replace);
-    Q_REVISION(1) void zPosRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1, 1) void xPosRolePatternChanged(const QRegularExpression &pattern);
+    Q_REVISION(1, 1) void yPosRolePatternChanged(const QRegularExpression &pattern);
+    Q_REVISION(1, 1) void zPosRolePatternChanged(const QRegularExpression &pattern);
+    Q_REVISION(1, 1) void rotationRolePatternChanged(const QRegularExpression &pattern);
+    Q_REVISION(1, 1) void rotationRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1, 1) void xPosRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1, 1) void yPosRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1, 1) void zPosRoleReplaceChanged(const QString &replace);
 
 protected:
     QItemModelScatterDataProxyPrivate *dptr();
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
index 168d6bae..7a3abbb9 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.h
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
@@ -54,17 +54,17 @@ class QT_DATAVISUALIZATION_EXPORT QItemModelSurfaceDataProxy : public QSurfaceDa
     Q_PROPERTY(bool useModelCategories READ useModelCategories WRITE setUseModelCategories NOTIFY useModelCategoriesChanged)
     Q_PROPERTY(bool autoRowCategories READ autoRowCategories WRITE setAutoRowCategories NOTIFY autoRowCategoriesChanged)
     Q_PROPERTY(bool autoColumnCategories READ autoColumnCategories WRITE setAutoColumnCategories NOTIFY autoColumnCategoriesChanged)
-    Q_PROPERTY(QRegularExpression rowRolePattern READ rowRolePattern WRITE setRowRolePattern NOTIFY rowRolePatternChanged REVISION 1)
-    Q_PROPERTY(QRegularExpression columnRolePattern READ columnRolePattern WRITE setColumnRolePattern NOTIFY columnRolePatternChanged REVISION 1)
-    Q_PROPERTY(QRegularExpression xPosRolePattern READ xPosRolePattern WRITE setXPosRolePattern NOTIFY xPosRolePatternChanged REVISION 1)
-    Q_PROPERTY(QRegularExpression yPosRolePattern READ yPosRolePattern WRITE setYPosRolePattern NOTIFY yPosRolePatternChanged REVISION 1)
-    Q_PROPERTY(QRegularExpression zPosRolePattern READ zPosRolePattern WRITE setZPosRolePattern NOTIFY zPosRolePatternChanged REVISION 1)
-    Q_PROPERTY(QString rowRoleReplace READ rowRoleReplace WRITE setRowRoleReplace NOTIFY rowRoleReplaceChanged REVISION 1)
-    Q_PROPERTY(QString columnRoleReplace READ columnRoleReplace WRITE setColumnRoleReplace NOTIFY columnRoleReplaceChanged REVISION 1)
-    Q_PROPERTY(QString xPosRoleReplace READ xPosRoleReplace WRITE setXPosRoleReplace NOTIFY xPosRoleReplaceChanged REVISION 1)
-    Q_PROPERTY(QString yPosRoleReplace READ yPosRoleReplace WRITE setYPosRoleReplace NOTIFY yPosRoleReplaceChanged REVISION 1)
-    Q_PROPERTY(QString zPosRoleReplace READ zPosRoleReplace WRITE setZPosRoleReplace NOTIFY zPosRoleReplaceChanged REVISION 1)
-    Q_PROPERTY(MultiMatchBehavior multiMatchBehavior READ multiMatchBehavior WRITE setMultiMatchBehavior NOTIFY multiMatchBehaviorChanged REVISION 1)
+    Q_PROPERTY(QRegularExpression rowRolePattern READ rowRolePattern WRITE setRowRolePattern NOTIFY rowRolePatternChanged REVISION(1, 1))
+    Q_PROPERTY(QRegularExpression columnRolePattern READ columnRolePattern WRITE setColumnRolePattern NOTIFY columnRolePatternChanged REVISION(1, 1))
+    Q_PROPERTY(QRegularExpression xPosRolePattern READ xPosRolePattern WRITE setXPosRolePattern NOTIFY xPosRolePatternChanged REVISION(1, 1))
+    Q_PROPERTY(QRegularExpression yPosRolePattern READ yPosRolePattern WRITE setYPosRolePattern NOTIFY yPosRolePatternChanged REVISION(1, 1))
+    Q_PROPERTY(QRegularExpression zPosRolePattern READ zPosRolePattern WRITE setZPosRolePattern NOTIFY zPosRolePatternChanged REVISION(1, 1))
+    Q_PROPERTY(QString rowRoleReplace READ rowRoleReplace WRITE setRowRoleReplace NOTIFY rowRoleReplaceChanged REVISION(1, 1))
+    Q_PROPERTY(QString columnRoleReplace READ columnRoleReplace WRITE setColumnRoleReplace NOTIFY columnRoleReplaceChanged REVISION(1, 1))
+    Q_PROPERTY(QString xPosRoleReplace READ xPosRoleReplace WRITE setXPosRoleReplace NOTIFY xPosRoleReplaceChanged REVISION(1, 1))
+    Q_PROPERTY(QString yPosRoleReplace READ yPosRoleReplace WRITE setYPosRoleReplace NOTIFY yPosRoleReplaceChanged REVISION(1, 1))
+    Q_PROPERTY(QString zPosRoleReplace READ zPosRoleReplace WRITE setZPosRoleReplace NOTIFY zPosRoleReplaceChanged REVISION(1, 1))
+    Q_PROPERTY(MultiMatchBehavior multiMatchBehavior READ multiMatchBehavior WRITE setMultiMatchBehavior NOTIFY multiMatchBehaviorChanged REVISION(1, 1))
 
 public:
     enum MultiMatchBehavior {
@@ -169,17 +169,17 @@ Q_SIGNALS:
     void useModelCategoriesChanged(bool enable);
     void autoRowCategoriesChanged(bool enable);
     void autoColumnCategoriesChanged(bool enable);
-    Q_REVISION(1) void rowRolePatternChanged(const QRegularExpression &pattern);
-    Q_REVISION(1) void columnRolePatternChanged(const QRegularExpression &pattern);
-    Q_REVISION(1) void xPosRolePatternChanged(const QRegularExpression &pattern);
-    Q_REVISION(1) void yPosRolePatternChanged(const QRegularExpression &pattern);
-    Q_REVISION(1) void zPosRolePatternChanged(const QRegularExpression &pattern);
-    Q_REVISION(1) void rowRoleReplaceChanged(const QString &replace);
-    Q_REVISION(1) void columnRoleReplaceChanged(const QString &replace);
-    Q_REVISION(1) void xPosRoleReplaceChanged(const QString &replace);
-    Q_REVISION(1) void yPosRoleReplaceChanged(const QString &replace);
-    Q_REVISION(1) void zPosRoleReplaceChanged(const QString &replace);
-    Q_REVISION(1) void multiMatchBehaviorChanged(MultiMatchBehavior behavior);
+    Q_REVISION(1, 1) void rowRolePatternChanged(const QRegularExpression &pattern);
+    Q_REVISION(1, 1) void columnRolePatternChanged(const QRegularExpression &pattern);
+    Q_REVISION(1, 1) void xPosRolePatternChanged(const QRegularExpression &pattern);
+    Q_REVISION(1, 1) void yPosRolePatternChanged(const QRegularExpression &pattern);
+    Q_REVISION(1, 1) void zPosRolePatternChanged(const QRegularExpression &pattern);
+    Q_REVISION(1, 1) void rowRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1, 1) void columnRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1, 1) void xPosRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1, 1) void yPosRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1, 1) void zPosRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1, 1) void multiMatchBehaviorChanged(MultiMatchBehavior behavior);
 
 protected:
     QItemModelSurfaceDataProxyPrivate *dptr();
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h
index 916b3e1e..2aee01ef 100644
--- a/src/datavisualization/engine/abstract3dcontroller_p.h
+++ b/src/datavisualization/engine/abstract3dcontroller_p.h
@@ -40,7 +40,8 @@
 #ifndef ABSTRACT3DCONTROLLER_P_H
 #define ABSTRACT3DCONTROLLER_P_H
 
-#include "datavisualizationglobal_p.h"
+#include <private/datavisualizationglobal_p.h>
+
 #include "qabstract3daxis.h"
 #include "drawer_p.h"
 #include "qabstract3dinputhandler.h"
diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h
index 52943cb0..e57263a1 100644
--- a/src/datavisualization/engine/bars3dcontroller_p.h
+++ b/src/datavisualization/engine/bars3dcontroller_p.h
@@ -40,8 +40,8 @@
 #ifndef Q3DBARSCONTROLLER_p_H
 #define Q3DBARSCONTROLLER_p_H
 
-#include "datavisualizationglobal_p.h"
-#include "abstract3dcontroller_p.h"
+#include <private/datavisualizationglobal_p.h>
+#include <private/abstract3dcontroller_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/datavisualization/engine/drawer_p.h b/src/datavisualization/engine/drawer_p.h
index e662ce26..425c0e24 100644
--- a/src/datavisualization/engine/drawer_p.h
+++ b/src/datavisualization/engine/drawer_p.h
@@ -40,11 +40,12 @@
 #ifndef DRAWER_P_H
 #define DRAWER_P_H
 
-#include "datavisualizationglobal_p.h"
-#include "q3dbars.h"
-#include "q3dtheme.h"
-#include "labelitem_p.h"
-#include "abstractrenderitem_p.h"
+#include <private/datavisualizationglobal_p.h>
+#include <private/labelitem_p.h>
+#include <private/abstractrenderitem_p.h>
+
+#include <QtDataVisualization/q3dbars.h>
+#include <QtDataVisualization/q3dtheme.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h
index be1f48de..a758afba 100644
--- a/src/datavisualization/engine/q3dcamera.h
+++ b/src/datavisualization/engine/q3dcamera.h
@@ -46,9 +46,9 @@ class QT_DATAVISUALIZATION_EXPORT Q3DCamera : public Q3DObject
     Q_PROPERTY(CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset NOTIFY cameraPresetChanged)
     Q_PROPERTY(bool wrapXRotation READ wrapXRotation WRITE setWrapXRotation NOTIFY wrapXRotationChanged)
     Q_PROPERTY(bool wrapYRotation READ wrapYRotation WRITE setWrapYRotation NOTIFY wrapYRotationChanged)
-    Q_PROPERTY(QVector3D target READ target WRITE setTarget NOTIFY targetChanged REVISION 1)
-    Q_PROPERTY(float minZoomLevel READ minZoomLevel WRITE setMinZoomLevel NOTIFY minZoomLevelChanged REVISION 1)
-    Q_PROPERTY(float maxZoomLevel READ maxZoomLevel WRITE setMaxZoomLevel NOTIFY maxZoomLevelChanged REVISION 1)
+    Q_PROPERTY(QVector3D target READ target WRITE setTarget NOTIFY targetChanged REVISION(1, 2))
+    Q_PROPERTY(float minZoomLevel READ minZoomLevel WRITE setMinZoomLevel NOTIFY minZoomLevelChanged REVISION(1, 2))
+    Q_PROPERTY(float maxZoomLevel READ maxZoomLevel WRITE setMaxZoomLevel NOTIFY maxZoomLevelChanged REVISION(1, 2))
 
 public:
     enum CameraPreset {
@@ -117,9 +117,9 @@ Q_SIGNALS:
     void cameraPresetChanged(Q3DCamera::CameraPreset preset);
     void wrapXRotationChanged(bool isEnabled);
     void wrapYRotationChanged(bool isEnabled);
-    Q_REVISION(1) void targetChanged(const QVector3D &target);
-    Q_REVISION(1) void minZoomLevelChanged(float zoomLevel);
-    Q_REVISION(1) void maxZoomLevelChanged(float zoomLevel);
+    Q_REVISION(1, 2) void targetChanged(const QVector3D &target);
+    Q_REVISION(1, 2) void minZoomLevelChanged(float zoomLevel);
+    Q_REVISION(1, 2) void maxZoomLevelChanged(float zoomLevel);
 
 private:
     QScopedPointer<Q3DCameraPrivate> d_ptr;
diff --git a/src/datavisualization/engine/q3dlight.h b/src/datavisualization/engine/q3dlight.h
index 8c0a65a0..94067ac4 100644
--- a/src/datavisualization/engine/q3dlight.h
+++ b/src/datavisualization/engine/q3dlight.h
@@ -39,7 +39,7 @@ class Q3DLightPrivate;
 class QT_DATAVISUALIZATION_EXPORT Q3DLight : public Q3DObject
 {
     Q_OBJECT
-    Q_PROPERTY(bool autoPosition READ isAutoPosition WRITE setAutoPosition NOTIFY autoPositionChanged REVISION 1)
+    Q_PROPERTY(bool autoPosition READ isAutoPosition WRITE setAutoPosition NOTIFY autoPositionChanged REVISION(1, 3))
 
 public:
     explicit Q3DLight(QObject *parent = nullptr);
@@ -49,7 +49,7 @@ public:
     bool isAutoPosition();
 
 Q_SIGNALS:
-    Q_REVISION(1) void autoPositionChanged(bool autoPosition);
+    Q_REVISION(1, 3) void autoPositionChanged(bool autoPosition);
 
 private:
     QScopedPointer<Q3DLightPrivate> d_ptr;
diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h
index 23884478..4e29c32d 100644
--- a/src/datavisualization/engine/q3dscene.h
+++ b/src/datavisualization/engine/q3dscene.h
@@ -52,7 +52,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DScene : public QObject
     Q_PROPERTY(Q3DCamera* activeCamera READ activeCamera WRITE setActiveCamera NOTIFY activeCameraChanged)
     Q_PROPERTY(Q3DLight* activeLight READ activeLight WRITE setActiveLight NOTIFY activeLightChanged)
     Q_PROPERTY(float devicePixelRatio READ devicePixelRatio WRITE setDevicePixelRatio NOTIFY devicePixelRatioChanged)
-    Q_PROPERTY(QPoint graphPositionQuery READ graphPositionQuery WRITE setGraphPositionQuery NOTIFY graphPositionQueryChanged REVISION 1)
+    Q_PROPERTY(QPoint graphPositionQuery READ graphPositionQuery WRITE setGraphPositionQuery NOTIFY graphPositionQueryChanged REVISION(1, 2))
 
 public:
     explicit Q3DScene(QObject *parent = nullptr);
@@ -100,7 +100,7 @@ Q_SIGNALS:
     void activeLightChanged(Q3DLight *light);
     void devicePixelRatioChanged(float pixelRatio);
     void selectionQueryPositionChanged(const QPoint &position);
-    Q_REVISION(1) void graphPositionQueryChanged(const QPoint &position);
+    Q_REVISION(1, 2) void graphPositionQueryChanged(const QPoint &position);
 
 private:
     QScopedPointer<Q3DScenePrivate> d_ptr;
diff --git a/src/datavisualization/engine/q3dscene_p.h b/src/datavisualization/engine/q3dscene_p.h
index 48124e1c..434ed9c7 100644
--- a/src/datavisualization/engine/q3dscene_p.h
+++ b/src/datavisualization/engine/q3dscene_p.h
@@ -40,8 +40,8 @@
 #ifndef Q3DSCENE_P_H
 #define Q3DSCENE_P_H
 
-#include "datavisualizationglobal_p.h"
-#include "q3dscene.h"
+#include <private/datavisualizationglobal_p.h>
+#include <QtDataVisualization/q3dscene.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/datavisualization/engine/scatter3dcontroller_p.h b/src/datavisualization/engine/scatter3dcontroller_p.h
index c4a73aea..257eb056 100644
--- a/src/datavisualization/engine/scatter3dcontroller_p.h
+++ b/src/datavisualization/engine/scatter3dcontroller_p.h
@@ -40,8 +40,8 @@
 #ifndef Q3DSCATTERCONTROLLER_p_H
 #define Q3DSCATTERCONTROLLER_p_H
 
-#include "datavisualizationglobal_p.h"
-#include "abstract3dcontroller_p.h"
+#include <private/datavisualizationglobal_p.h>
+#include <private/abstract3dcontroller_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h
index 78fa06c6..0c2e31ff 100644
--- a/src/datavisualization/engine/surface3dcontroller_p.h
+++ b/src/datavisualization/engine/surface3dcontroller_p.h
@@ -40,8 +40,8 @@
 #ifndef SURFACE3DCONTROLLER_P_H
 #define SURFACE3DCONTROLLER_P_H
 
-#include "abstract3dcontroller_p.h"
-#include "datavisualizationglobal_p.h"
+#include <private/abstract3dcontroller_p.h>
+#include <private/datavisualizationglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/datavisualization/theme/q3dtheme_p.h b/src/datavisualization/theme/q3dtheme_p.h
index 94d5f4ae..d11b8146 100644
--- a/src/datavisualization/theme/q3dtheme_p.h
+++ b/src/datavisualization/theme/q3dtheme_p.h
@@ -40,7 +40,7 @@
 #ifndef Q3DTHEME_P_H
 #define Q3DTHEME_P_H
 
-#include "datavisualizationglobal_p.h"
+#include <private/datavisualizationglobal_p.h>
 #include "q3dtheme.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/datavisualizationqml2/CMakeLists.txt b/src/datavisualizationqml/CMakeLists.txt
index d131151d..4c673a6f 100644
--- a/src/datavisualizationqml2/CMakeLists.txt
+++ b/src/datavisualizationqml/CMakeLists.txt
@@ -14,26 +14,19 @@ set(qml_files
     "designer/images/surface3d-icon16.png"
 )
 
-set_source_files_properties(
-    ${qml_files}
-    PROPERTIES
-        QT_QML_SKIP_QMLDIR_ENTRY TRUE
+set_source_files_properties(${qml_files} PROPERTIES
+    QT_QML_SKIP_QMLDIR_ENTRY TRUE
 )
 
-qt_internal_add_qml_module(DataVisualizationQml2
+qt_internal_add_qml_module(DataVisualizationQml
     URI "QtDataVisualization"
     VERSION "${PROJECT_VERSION}"
     PAST_MAJOR_VERSIONS 1
-    CLASS_NAME QtDataVisualizationQml2Plugin
-    PLUGIN_TARGET DataVisualizationQml2
-    NO_PLUGIN_OPTIONAL
-    NO_GENERATE_PLUGIN_SOURCE
-    NO_GENERATE_QMLTYPES
-    INSTALL_SOURCE_QMLTYPES "plugins.qmltypes"
+    DEPENDENCIES
+        QtQuick
     SOURCES
         abstractdeclarative.cpp abstractdeclarative_p.h
         colorgradient.cpp colorgradient_p.h
-        datavisualizationqml2_plugin.cpp datavisualizationqml2_plugin.h
         declarativebars.cpp declarativebars_p.h
         declarativecolor.cpp declarativecolor_p.h
         declarativerendernode.cpp declarativerendernode_p.h
@@ -43,16 +36,8 @@ qt_internal_add_qml_module(DataVisualizationQml2
         declarativesurface.cpp declarativesurface_p.h
         declarativetheme.cpp declarativetheme_p.h
         enumtostringmap.cpp enumtostringmap_p.h
+        foreigntypes_p.h
         glstatestore.cpp glstatestore_p.h
-    INCLUDE_DIRECTORIES
-        ../../include
-        ../../include/QtDataVisualization
-        ../datavisualization/axis
-        ../datavisualization/data
-        ../datavisualization/engine
-        ../datavisualization/global
-        ../datavisualization/input
-        ../datavisualization/theme
     QML_FILES
         ${qml_files}
     PUBLIC_LIBRARIES
@@ -61,11 +46,10 @@ qt_internal_add_qml_module(DataVisualizationQml2
         Qt::OpenGL
         Qt::Qml
         Qt::Quick
-        DataVisualization
+        DataVisualizationPrivate
 )
 
-qt_internal_extend_target(DataVisualizationQml2 CONDITION MACOS
+qt_internal_extend_target(DataVisualizationQml CONDITION MACOS
     PUBLIC_LIBRARIES
         Qt::GuiPrivate
 )
-
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml/abstractdeclarative.cpp
index dbbd803d..dbbd803d 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml/abstractdeclarative.cpp
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml/abstractdeclarative_p.h
index dd560150..3b9d4d96 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml/abstractdeclarative_p.h
@@ -40,10 +40,11 @@
 #ifndef ABSTRACTDECLARATIVE_P_H
 #define ABSTRACTDECLARATIVE_P_H
 
-#include "datavisualizationglobal_p.h"
-#include "abstract3dcontroller_p.h"
 #include "declarativescene_p.h"
 
+#include <private/datavisualizationglobal_p.h>
+#include <private/abstract3dcontroller_p.h>
+
 #include <QtQuick/QQuickItem>
 #include <QtCore/QPointer>
 #include <QtCore/QThread>
@@ -57,11 +58,6 @@ QT_BEGIN_NAMESPACE
 class AbstractDeclarative : public QQuickItem
 {
     Q_OBJECT
-    Q_ENUMS(ShadowQuality)
-    Q_ENUMS(RenderingMode)
-    Q_ENUMS(ElementType)
-    Q_FLAGS(SelectionFlag SelectionFlags)
-    Q_FLAGS(OptimizationHint OptimizationHints)
     Q_PROPERTY(SelectionFlags selectionMode READ selectionMode WRITE setSelectionMode NOTIFY selectionModeChanged)
     Q_PROPERTY(ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged)
     Q_PROPERTY(bool shadowsSupported READ shadowsSupported NOTIFY shadowsSupportedChanged)
@@ -70,21 +66,25 @@ class AbstractDeclarative : public QQuickItem
     Q_PROPERTY(QAbstract3DInputHandler* inputHandler READ inputHandler WRITE setInputHandler NOTIFY inputHandlerChanged)
     Q_PROPERTY(Q3DTheme* theme READ theme WRITE setTheme NOTIFY themeChanged)
     Q_PROPERTY(RenderingMode renderingMode READ renderingMode WRITE setRenderingMode NOTIFY renderingModeChanged)
-    Q_PROPERTY(bool measureFps READ measureFps WRITE setMeasureFps NOTIFY measureFpsChanged REVISION 1)
-    Q_PROPERTY(qreal currentFps READ currentFps NOTIFY currentFpsChanged REVISION 1)
-    Q_PROPERTY(QQmlListProperty<QCustom3DItem> customItemList READ customItemList REVISION 1)
-    Q_PROPERTY(bool orthoProjection READ isOrthoProjection WRITE setOrthoProjection NOTIFY orthoProjectionChanged REVISION 1)
-    Q_PROPERTY(ElementType selectedElement READ selectedElement NOTIFY selectedElementChanged REVISION 1)
-    Q_PROPERTY(qreal aspectRatio READ aspectRatio WRITE setAspectRatio NOTIFY aspectRatioChanged REVISION 1)
-    Q_PROPERTY(OptimizationHints optimizationHints READ optimizationHints WRITE setOptimizationHints NOTIFY optimizationHintsChanged REVISION 1)
-    Q_PROPERTY(bool polar READ isPolar WRITE setPolar NOTIFY polarChanged REVISION 2)
-    Q_PROPERTY(float radialLabelOffset READ radialLabelOffset WRITE setRadialLabelOffset NOTIFY radialLabelOffsetChanged REVISION 2)
-    Q_PROPERTY(qreal horizontalAspectRatio READ horizontalAspectRatio WRITE setHorizontalAspectRatio NOTIFY horizontalAspectRatioChanged REVISION 2)
-    Q_PROPERTY(bool reflection READ isReflection WRITE setReflection NOTIFY reflectionChanged REVISION 2)
-    Q_PROPERTY(qreal reflectivity READ reflectivity WRITE setReflectivity NOTIFY reflectivityChanged REVISION 2)
-    Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged REVISION 2)
-    Q_PROPERTY(QVector3D queriedGraphPosition READ queriedGraphPosition NOTIFY queriedGraphPositionChanged REVISION 2)
-    Q_PROPERTY(qreal margin READ margin WRITE setMargin NOTIFY marginChanged REVISION 2)
+    Q_PROPERTY(bool measureFps READ measureFps WRITE setMeasureFps NOTIFY measureFpsChanged REVISION(1, 1))
+    Q_PROPERTY(qreal currentFps READ currentFps NOTIFY currentFpsChanged REVISION(1, 1))
+    Q_PROPERTY(QQmlListProperty<QCustom3DItem> customItemList READ customItemList REVISION(1, 1))
+    Q_PROPERTY(bool orthoProjection READ isOrthoProjection WRITE setOrthoProjection NOTIFY orthoProjectionChanged REVISION(1, 1))
+    Q_PROPERTY(ElementType selectedElement READ selectedElement NOTIFY selectedElementChanged REVISION(1, 1))
+    Q_PROPERTY(qreal aspectRatio READ aspectRatio WRITE setAspectRatio NOTIFY aspectRatioChanged REVISION(1, 1))
+    Q_PROPERTY(OptimizationHints optimizationHints READ optimizationHints WRITE setOptimizationHints NOTIFY optimizationHintsChanged REVISION(1, 1))
+    Q_PROPERTY(bool polar READ isPolar WRITE setPolar NOTIFY polarChanged REVISION(1, 2))
+    Q_PROPERTY(float radialLabelOffset READ radialLabelOffset WRITE setRadialLabelOffset NOTIFY radialLabelOffsetChanged REVISION(1, 2))
+    Q_PROPERTY(qreal horizontalAspectRatio READ horizontalAspectRatio WRITE setHorizontalAspectRatio NOTIFY horizontalAspectRatioChanged REVISION(1, 2))
+    Q_PROPERTY(bool reflection READ isReflection WRITE setReflection NOTIFY reflectionChanged REVISION(1, 2))
+    Q_PROPERTY(qreal reflectivity READ reflectivity WRITE setReflectivity NOTIFY reflectivityChanged REVISION(1, 2))
+    Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged REVISION(1, 2))
+    Q_PROPERTY(QVector3D queriedGraphPosition READ queriedGraphPosition NOTIFY queriedGraphPositionChanged REVISION(1, 2))
+    Q_PROPERTY(qreal margin READ margin WRITE setMargin NOTIFY marginChanged REVISION(1, 2))
+
+    QML_NAMED_ELEMENT(AbstractGraph3D)
+    QML_ADDED_IN_VERSION(1, 0)
+    QML_UNCREATABLE("Trying to create uncreatable: AbstractGraph3D.")
 
 public:
     enum SelectionFlag {
@@ -132,6 +132,12 @@ public:
     };
     Q_DECLARE_FLAGS(OptimizationHints, OptimizationHint)
 
+    Q_ENUM(ShadowQuality)
+    Q_ENUM(RenderingMode)
+    Q_ENUM(ElementType)
+    Q_FLAGS(SelectionFlag SelectionFlags)
+    Q_FLAGS(OptimizationHint OptimizationHints)
+
 public:
     explicit AbstractDeclarative(QQuickItem *parent = 0);
     virtual ~AbstractDeclarative();
@@ -162,17 +168,17 @@ public:
 
     Q_INVOKABLE virtual void clearSelection();
 
-    Q_REVISION(1) Q_INVOKABLE virtual int addCustomItem(QCustom3DItem *item);
-    Q_REVISION(1) Q_INVOKABLE virtual void removeCustomItems();
-    Q_REVISION(1) Q_INVOKABLE virtual void removeCustomItem(QCustom3DItem *item);
-    Q_REVISION(1) Q_INVOKABLE virtual void removeCustomItemAt(const QVector3D &position);
-    Q_REVISION(1) Q_INVOKABLE virtual void releaseCustomItem(QCustom3DItem *item);
+    Q_REVISION(1, 1) Q_INVOKABLE virtual int addCustomItem(QCustom3DItem *item);
+    Q_REVISION(1, 1) Q_INVOKABLE virtual void removeCustomItems();
+    Q_REVISION(1, 1) Q_INVOKABLE virtual void removeCustomItem(QCustom3DItem *item);
+    Q_REVISION(1, 1) Q_INVOKABLE virtual void removeCustomItemAt(const QVector3D &position);
+    Q_REVISION(1, 1) Q_INVOKABLE virtual void releaseCustomItem(QCustom3DItem *item);
 
-    Q_REVISION(1) Q_INVOKABLE virtual int selectedLabelIndex() const;
-    Q_REVISION(1) Q_INVOKABLE virtual QAbstract3DAxis *selectedAxis() const;
+    Q_REVISION(1, 1) Q_INVOKABLE virtual int selectedLabelIndex() const;
+    Q_REVISION(1, 1) Q_INVOKABLE virtual QAbstract3DAxis *selectedAxis() const;
 
-    Q_REVISION(1) Q_INVOKABLE virtual int selectedCustomItemIndex() const;
-    Q_REVISION(1) Q_INVOKABLE virtual QCustom3DItem *selectedCustomItem() const;
+    Q_REVISION(1, 1) Q_INVOKABLE virtual int selectedCustomItemIndex() const;
+    Q_REVISION(1, 1) Q_INVOKABLE virtual QCustom3DItem *selectedCustomItem() const;
 
     QQmlListProperty<QCustom3DItem> customItemList();
     static void appendCustomItemFunc(QQmlListProperty<QCustom3DItem> *list,
@@ -267,20 +273,20 @@ Q_SIGNALS:
     void inputHandlerChanged(QAbstract3DInputHandler *inputHandler);
     void themeChanged(Q3DTheme *theme);
     void renderingModeChanged(AbstractDeclarative::RenderingMode mode);
-    Q_REVISION(1) void measureFpsChanged(bool enabled);
-    Q_REVISION(1) void currentFpsChanged(qreal fps);
-    Q_REVISION(1) void selectedElementChanged(AbstractDeclarative::ElementType type);
-    Q_REVISION(1) void orthoProjectionChanged(bool enabled);
-    Q_REVISION(1) void aspectRatioChanged(qreal ratio);
-    Q_REVISION(1) void optimizationHintsChanged(AbstractDeclarative::OptimizationHints hints);
-    Q_REVISION(2) void polarChanged(bool enabled);
-    Q_REVISION(2) void radialLabelOffsetChanged(float offset);
-    Q_REVISION(2) void horizontalAspectRatioChanged(qreal ratio);
-    Q_REVISION(2) void reflectionChanged(bool enabled);
-    Q_REVISION(2) void reflectivityChanged(qreal reflectivity);
-    Q_REVISION(2) void localeChanged(const QLocale &locale);
-    Q_REVISION(2) void queriedGraphPositionChanged(const QVector3D &data);
-    Q_REVISION(2) void marginChanged(qreal margin);
+    Q_REVISION(1, 1) void measureFpsChanged(bool enabled);
+    Q_REVISION(1, 1) void currentFpsChanged(qreal fps);
+    Q_REVISION(1, 1) void selectedElementChanged(AbstractDeclarative::ElementType type);
+    Q_REVISION(1, 1) void orthoProjectionChanged(bool enabled);
+    Q_REVISION(1, 1) void aspectRatioChanged(qreal ratio);
+    Q_REVISION(1, 1) void optimizationHintsChanged(AbstractDeclarative::OptimizationHints hints);
+    Q_REVISION(1, 2) void polarChanged(bool enabled);
+    Q_REVISION(1, 2) void radialLabelOffsetChanged(float offset);
+    Q_REVISION(1, 2) void horizontalAspectRatioChanged(qreal ratio);
+    Q_REVISION(1, 2) void reflectionChanged(bool enabled);
+    Q_REVISION(1, 2) void reflectivityChanged(qreal reflectivity);
+    Q_REVISION(1, 2) void localeChanged(const QLocale &locale);
+    Q_REVISION(1, 2) void queriedGraphPositionChanged(const QVector3D &data);
+    Q_REVISION(1, 2) void marginChanged(qreal margin);
 
 protected:
     QSharedPointer<QMutex> m_nodeMutex;
diff --git a/src/datavisualizationqml2/colorgradient.cpp b/src/datavisualizationqml/colorgradient.cpp
index 3f6881b0..3f6881b0 100644
--- a/src/datavisualizationqml2/colorgradient.cpp
+++ b/src/datavisualizationqml/colorgradient.cpp
diff --git a/src/datavisualizationqml2/colorgradient_p.h b/src/datavisualizationqml/colorgradient_p.h
index 3e5162a7..ec21cd2f 100644
--- a/src/datavisualizationqml2/colorgradient_p.h
+++ b/src/datavisualizationqml/colorgradient_p.h
@@ -40,9 +40,9 @@
 #ifndef COLORGRADIENT_P_H
 #define COLORGRADIENT_P_H
 
-#include "datavisualizationglobal_p.h"
+#include <private/datavisualizationglobal_p.h>
 #include <QtGui/QColor>
-#include <QtQml/QQmlListProperty>
+#include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -53,6 +53,9 @@ class ColorGradientStop : public QObject
     Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged)
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
 
+    QML_ELEMENT
+    QML_ADDED_IN_VERSION(1, 0)
+
 public:
     ColorGradientStop(QObject *parent = 0);
 
@@ -81,6 +84,9 @@ class ColorGradient : public QObject
     Q_PROPERTY(QQmlListProperty<ColorGradientStop> stops READ stops)
     Q_CLASSINFO("DefaultProperty", "stops")
 
+    QML_ELEMENT
+    QML_ADDED_IN_VERSION(1, 0)
+
 public:
     ColorGradient(QObject *parent = 0);
     ~ColorGradient();
diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml/declarativebars.cpp
index fe90e159..fe90e159 100644
--- a/src/datavisualizationqml2/declarativebars.cpp
+++ b/src/datavisualizationqml/declarativebars.cpp
diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml/declarativebars_p.h
index 97359ede..acf1a030 100644
--- a/src/datavisualizationqml2/declarativebars_p.h
+++ b/src/datavisualizationqml/declarativebars_p.h
@@ -40,12 +40,12 @@
 #ifndef DECLARATIVEBARS_P_H
 #define DECLARATIVEBARS_P_H
 
-#include "datavisualizationglobal_p.h"
 #include "abstractdeclarative_p.h"
-#include "bars3dcontroller_p.h"
 
-QT_BEGIN_NAMESPACE
+#include <private/datavisualizationglobal_p.h>
+#include <private/bars3dcontroller_p.h>
 
+QT_BEGIN_NAMESPACE
 class DeclarativeBars : public AbstractDeclarative
 {
     Q_OBJECT
@@ -59,9 +59,12 @@ class DeclarativeBars : public AbstractDeclarative
     Q_PROPERTY(QQmlListProperty<QBar3DSeries> seriesList READ seriesList)
     Q_PROPERTY(QBar3DSeries *selectedSeries READ selectedSeries NOTIFY selectedSeriesChanged)
     Q_PROPERTY(QBar3DSeries *primarySeries READ primarySeries WRITE setPrimarySeries NOTIFY primarySeriesChanged)
-    Q_PROPERTY(float floorLevel READ floorLevel WRITE setFloorLevel NOTIFY floorLevelChanged REVISION 1)
+    Q_PROPERTY(float floorLevel READ floorLevel WRITE setFloorLevel NOTIFY floorLevelChanged REVISION(1, 2))
     Q_CLASSINFO("DefaultProperty", "seriesList")
 
+    QML_NAMED_ELEMENT(Bars3D)
+    QML_ADDED_IN_VERSION(1, 0)
+
 public:
     explicit DeclarativeBars(QQuickItem *parent = 0);
     ~DeclarativeBars();
@@ -116,7 +119,7 @@ Q_SIGNALS:
     void meshFileNameChanged(QString filename);
     void primarySeriesChanged(QBar3DSeries *series);
     void selectedSeriesChanged(QBar3DSeries *series);
-    Q_REVISION(1) void floorLevelChanged(float level);
+    Q_REVISION(1, 2) void floorLevelChanged(float level);
 
 private:
     Bars3DController *m_barsController;
diff --git a/src/datavisualizationqml2/declarativecolor.cpp b/src/datavisualizationqml/declarativecolor.cpp
index 177c0fbe..177c0fbe 100644
--- a/src/datavisualizationqml2/declarativecolor.cpp
+++ b/src/datavisualizationqml/declarativecolor.cpp
diff --git a/src/datavisualizationqml2/declarativecolor_p.h b/src/datavisualizationqml/declarativecolor_p.h
index 54be5397..d197fcf6 100644
--- a/src/datavisualizationqml2/declarativecolor_p.h
+++ b/src/datavisualizationqml/declarativecolor_p.h
@@ -40,8 +40,9 @@
 #ifndef DECLARATIVECOLOR_P_H
 #define DECLARATIVECOLOR_P_H
 
-#include "datavisualizationglobal_p.h"
+#include <private/datavisualizationglobal_p.h>
 #include <QtGui/QColor>
+#include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -50,6 +51,9 @@ class DeclarativeColor : public QObject
     Q_OBJECT
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
 
+    QML_NAMED_ELEMENT(ThemeColor)
+    QML_ADDED_IN_VERSION(1, 0)
+
 public:
     DeclarativeColor(QObject *parent = 0);
 
diff --git a/src/datavisualizationqml2/declarativerendernode.cpp b/src/datavisualizationqml/declarativerendernode.cpp
index f99e1375..f99e1375 100644
--- a/src/datavisualizationqml2/declarativerendernode.cpp
+++ b/src/datavisualizationqml/declarativerendernode.cpp
diff --git a/src/datavisualizationqml2/declarativerendernode_p.h b/src/datavisualizationqml/declarativerendernode_p.h
index 4e3653f7..28cb0538 100644
--- a/src/datavisualizationqml2/declarativerendernode_p.h
+++ b/src/datavisualizationqml/declarativerendernode_p.h
@@ -40,7 +40,7 @@
 #ifndef DECLARATIVERENDERNODE_P_H
 #define DECLARATIVERENDERNODE_P_H
 
-#include "datavisualizationglobal_p.h"
+#include <private/datavisualizationglobal_p.h>
 
 #include <QtQuick/QSGGeometryNode>
 #include <QtQuick/QSGTextureMaterial>
diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml/declarativescatter.cpp
index 1417bc6d..1417bc6d 100644
--- a/src/datavisualizationqml2/declarativescatter.cpp
+++ b/src/datavisualizationqml/declarativescatter.cpp
diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml/declarativescatter_p.h
index 348112f2..18848e0b 100644
--- a/src/datavisualizationqml2/declarativescatter_p.h
+++ b/src/datavisualizationqml/declarativescatter_p.h
@@ -40,11 +40,12 @@
 #ifndef DECLARATIVESCATTER_P_H
 #define DECLARATIVESCATTER_P_H
 
-#include "datavisualizationglobal_p.h"
 #include "abstractdeclarative_p.h"
-#include "scatter3dcontroller_p.h"
 #include "qscatter3dseries.h"
 
+#include <private/datavisualizationglobal_p.h>
+#include <private/scatter3dcontroller_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class DeclarativeScatter : public AbstractDeclarative
@@ -57,6 +58,9 @@ class DeclarativeScatter : public AbstractDeclarative
     Q_PROPERTY(QQmlListProperty<QScatter3DSeries> seriesList READ seriesList)
     Q_CLASSINFO("DefaultProperty", "seriesList")
 
+    QML_NAMED_ELEMENT(Scatter3D)
+    QML_ADDED_IN_VERSION(1, 0)
+
 public:
     explicit DeclarativeScatter(QQuickItem *parent = 0);
     ~DeclarativeScatter();
diff --git a/src/datavisualizationqml2/declarativescene.cpp b/src/datavisualizationqml/declarativescene.cpp
index f4e5ae00..f4e5ae00 100644
--- a/src/datavisualizationqml2/declarativescene.cpp
+++ b/src/datavisualizationqml/declarativescene.cpp
diff --git a/src/datavisualizationqml2/declarativescene_p.h b/src/datavisualizationqml/declarativescene_p.h
index 70e3da82..26591d43 100644
--- a/src/datavisualizationqml2/declarativescene_p.h
+++ b/src/datavisualizationqml/declarativescene_p.h
@@ -40,8 +40,9 @@
 #ifndef DECLARATIVESCENE_P_H
 #define DECLARATIVESCENE_P_H
 
-#include "datavisualizationglobal_p.h"
-#include "q3dscene.h"
+#include <QtQml/qqml.h>
+#include <private/datavisualizationglobal_p.h>
+#include <QtDataVisualization/q3dscene.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -54,6 +55,10 @@ class Declarative3DScene : public Q3DScene
     // This is static method in parent class, overload as constant property for qml.
     Q_PROPERTY(QPoint invalidSelectionPoint READ invalidSelectionPoint CONSTANT)
 
+    QML_NAMED_ELEMENT(Scene3D)
+    QML_ADDED_IN_VERSION(1, 0)
+    QML_UNCREATABLE("Trying to create uncreatable: Scene3D.")
+
 public:
     Declarative3DScene(QObject *parent = 0);
     virtual ~Declarative3DScene();
diff --git a/src/datavisualizationqml2/declarativeseries.cpp b/src/datavisualizationqml/declarativeseries.cpp
index 38263a32..38263a32 100644
--- a/src/datavisualizationqml2/declarativeseries.cpp
+++ b/src/datavisualizationqml/declarativeseries.cpp
diff --git a/src/datavisualizationqml2/declarativeseries_p.h b/src/datavisualizationqml/declarativeseries_p.h
index 5f5a535a..115e67e0 100644
--- a/src/datavisualizationqml2/declarativeseries_p.h
+++ b/src/datavisualizationqml/declarativeseries_p.h
@@ -40,12 +40,13 @@
 #ifndef DECLARATIVESERIES_P_H
 #define DECLARATIVESERIES_P_H
 
-#include "datavisualizationglobal_p.h"
 #include "qbar3dseries.h"
 #include "qscatter3dseries.h"
 #include "qsurface3dseries.h"
 #include "colorgradient_p.h"
-#include <QtQml/QQmlListProperty>
+
+#include <private/datavisualizationglobal_p.h>
+#include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -69,6 +70,9 @@ class DeclarativeBar3DSeries : public QBar3DSeries
     Q_PROPERTY(ColorGradient *multiHighlightGradient READ multiHighlightGradient WRITE setMultiHighlightGradient NOTIFY multiHighlightGradientChanged)
     Q_CLASSINFO("DefaultProperty", "seriesChildren")
 
+    QML_NAMED_ELEMENT(Bar3DSeries)
+    QML_ADDED_IN_VERSION(1, 0)
+
 public:
     DeclarativeBar3DSeries(QObject *parent = 0);
     virtual ~DeclarativeBar3DSeries();
@@ -115,6 +119,9 @@ class DeclarativeScatter3DSeries : public QScatter3DSeries
     Q_PROPERTY(int invalidSelectionIndex READ invalidSelectionIndex CONSTANT)
     Q_CLASSINFO("DefaultProperty", "seriesChildren")
 
+    QML_NAMED_ELEMENT(Scatter3DSeries)
+    QML_ADDED_IN_VERSION(1, 0)
+
 public:
     DeclarativeScatter3DSeries(QObject *parent = 0);
     virtual ~DeclarativeScatter3DSeries();
@@ -161,6 +168,9 @@ class DeclarativeSurface3DSeries : public QSurface3DSeries
     Q_PROPERTY(ColorGradient *multiHighlightGradient READ multiHighlightGradient WRITE setMultiHighlightGradient NOTIFY multiHighlightGradientChanged)
     Q_CLASSINFO("DefaultProperty", "seriesChildren")
 
+    QML_NAMED_ELEMENT(Surface3DSeries)
+    QML_ADDED_IN_VERSION(1, 0)
+
 public:
     DeclarativeSurface3DSeries(QObject *parent = 0);
     virtual ~DeclarativeSurface3DSeries();
diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml/declarativesurface.cpp
index d422992a..d422992a 100644
--- a/src/datavisualizationqml2/declarativesurface.cpp
+++ b/src/datavisualizationqml/declarativesurface.cpp
diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml/declarativesurface_p.h
index c8720519..71f3c470 100644
--- a/src/datavisualizationqml2/declarativesurface_p.h
+++ b/src/datavisualizationqml/declarativesurface_p.h
@@ -40,11 +40,12 @@
 #ifndef DECLARATIVESURFACE_P_H
 #define DECLARATIVESURFACE_P_H
 
-#include "datavisualizationglobal_p.h"
 #include "abstractdeclarative_p.h"
-#include "surface3dcontroller_p.h"
 #include "qsurface3dseries.h"
 
+#include <private/datavisualizationglobal_p.h>
+#include <private/surface3dcontroller_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class DeclarativeSurface : public AbstractDeclarative
@@ -55,9 +56,12 @@ class DeclarativeSurface : public AbstractDeclarative
     Q_PROPERTY(QValue3DAxis *axisZ READ axisZ WRITE setAxisZ NOTIFY axisZChanged)
     Q_PROPERTY(QSurface3DSeries *selectedSeries READ selectedSeries NOTIFY selectedSeriesChanged)
     Q_PROPERTY(QQmlListProperty<QSurface3DSeries> seriesList READ seriesList)
-    Q_PROPERTY(bool flipHorizontalGrid READ flipHorizontalGrid WRITE setFlipHorizontalGrid NOTIFY flipHorizontalGridChanged REVISION 1)
+    Q_PROPERTY(bool flipHorizontalGrid READ flipHorizontalGrid WRITE setFlipHorizontalGrid NOTIFY flipHorizontalGridChanged REVISION(1, 2))
     Q_CLASSINFO("DefaultProperty", "seriesList")
 
+    QML_NAMED_ELEMENT(Surface3D)
+    QML_ADDED_IN_VERSION(1, 0)
+
 public:
     explicit DeclarativeSurface(QQuickItem *parent = 0);
     ~DeclarativeSurface();
@@ -91,7 +95,7 @@ Q_SIGNALS:
     void axisYChanged(QValue3DAxis *axis);
     void axisZChanged(QValue3DAxis *axis);
     void selectedSeriesChanged(QSurface3DSeries *series);
-    Q_REVISION(1) void flipHorizontalGridChanged(bool flip);
+    Q_REVISION(1, 2) void flipHorizontalGridChanged(bool flip);
 
 private:
     Surface3DController *m_surfaceController;
diff --git a/src/datavisualizationqml2/declarativetheme.cpp b/src/datavisualizationqml/declarativetheme.cpp
index 282f14b1..282f14b1 100644
--- a/src/datavisualizationqml2/declarativetheme.cpp
+++ b/src/datavisualizationqml/declarativetheme.cpp
diff --git a/src/datavisualizationqml2/declarativetheme_p.h b/src/datavisualizationqml/declarativetheme_p.h
index 11623406..ea59641d 100644
--- a/src/datavisualizationqml2/declarativetheme_p.h
+++ b/src/datavisualizationqml/declarativetheme_p.h
@@ -40,12 +40,14 @@
 #ifndef DECLARATIVETHEME_P_H
 #define DECLARATIVETHEME_P_H
 
-#include "datavisualizationglobal_p.h"
+#include <private/datavisualizationglobal_p.h>
+#include <private/q3dtheme_p.h>
+
 #include "declarativecolor_p.h"
 #include "colorgradient_p.h"
-#include "q3dtheme_p.h"
 
-#include <QtQml/QQmlParserStatus>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlparserstatus.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -59,6 +61,8 @@ class DeclarativeTheme3D : public Q3DTheme, public QQmlParserStatus
     Q_PROPERTY(ColorGradient *singleHighlightGradient READ singleHighlightGradient WRITE setSingleHighlightGradient NOTIFY singleHighlightGradientChanged)
     Q_PROPERTY(ColorGradient *multiHighlightGradient READ multiHighlightGradient WRITE setMultiHighlightGradient NOTIFY multiHighlightGradientChanged)
     Q_CLASSINFO("DefaultProperty", "themeChildren")
+    QML_NAMED_ELEMENT(Theme3D)
+    QML_ADDED_IN_VERSION(1, 0)
 
 public:
     DeclarativeTheme3D(QObject *parent = 0);
diff --git a/src/datavisualizationqml2/designer/Bars3DSpecifics.qml b/src/datavisualizationqml/designer/Bars3DSpecifics.qml
index cd1e76b4..cd1e76b4 100644
--- a/src/datavisualizationqml2/designer/Bars3DSpecifics.qml
+++ b/src/datavisualizationqml/designer/Bars3DSpecifics.qml
diff --git a/src/datavisualizationqml2/designer/Scatter3DSpecifics.qml b/src/datavisualizationqml/designer/Scatter3DSpecifics.qml
index b864fb16..b864fb16 100644
--- a/src/datavisualizationqml2/designer/Scatter3DSpecifics.qml
+++ b/src/datavisualizationqml/designer/Scatter3DSpecifics.qml
diff --git a/src/datavisualizationqml2/designer/Surface3DSpecifics.qml b/src/datavisualizationqml/designer/Surface3DSpecifics.qml
index 90c2f763..90c2f763 100644
--- a/src/datavisualizationqml2/designer/Surface3DSpecifics.qml
+++ b/src/datavisualizationqml/designer/Surface3DSpecifics.qml
diff --git a/src/datavisualizationqml2/designer/default/Bars3D.qml b/src/datavisualizationqml/designer/default/Bars3D.qml
index 32f4c939..32f4c939 100644
--- a/src/datavisualizationqml2/designer/default/Bars3D.qml
+++ b/src/datavisualizationqml/designer/default/Bars3D.qml
diff --git a/src/datavisualizationqml2/designer/default/Scatter3D.qml b/src/datavisualizationqml/designer/default/Scatter3D.qml
index 2c92d192..2c92d192 100644
--- a/src/datavisualizationqml2/designer/default/Scatter3D.qml
+++ b/src/datavisualizationqml/designer/default/Scatter3D.qml
diff --git a/src/datavisualizationqml2/designer/default/Surface3D.qml b/src/datavisualizationqml/designer/default/Surface3D.qml
index 66fd10fb..66fd10fb 100644
--- a/src/datavisualizationqml2/designer/default/Surface3D.qml
+++ b/src/datavisualizationqml/designer/default/Surface3D.qml
diff --git a/src/datavisualizationqml2/designer/images/bars3d-icon.png b/src/datavisualizationqml/designer/images/bars3d-icon.png
index 7f380789..7f380789 100644
--- a/src/datavisualizationqml2/designer/images/bars3d-icon.png
+++ b/src/datavisualizationqml/designer/images/bars3d-icon.png
diff --git a/src/datavisualizationqml2/designer/images/bars3d-icon16.png b/src/datavisualizationqml/designer/images/bars3d-icon16.png
index e85ff502..e85ff502 100644
--- a/src/datavisualizationqml2/designer/images/bars3d-icon16.png
+++ b/src/datavisualizationqml/designer/images/bars3d-icon16.png
diff --git a/src/datavisualizationqml2/designer/images/scatter3d-icon.png b/src/datavisualizationqml/designer/images/scatter3d-icon.png
index e1ac5c1f..e1ac5c1f 100644
--- a/src/datavisualizationqml2/designer/images/scatter3d-icon.png
+++ b/src/datavisualizationqml/designer/images/scatter3d-icon.png
diff --git a/src/datavisualizationqml2/designer/images/scatter3d-icon16.png b/src/datavisualizationqml/designer/images/scatter3d-icon16.png
index 75b2db18..75b2db18 100644
--- a/src/datavisualizationqml2/designer/images/scatter3d-icon16.png
+++ b/src/datavisualizationqml/designer/images/scatter3d-icon16.png
diff --git a/src/datavisualizationqml2/designer/images/surface3d-icon.png b/src/datavisualizationqml/designer/images/surface3d-icon.png
index 956c675e..956c675e 100644
--- a/src/datavisualizationqml2/designer/images/surface3d-icon.png
+++ b/src/datavisualizationqml/designer/images/surface3d-icon.png
diff --git a/src/datavisualizationqml2/designer/images/surface3d-icon16.png b/src/datavisualizationqml/designer/images/surface3d-icon16.png
index 6caa643e..6caa643e 100644
--- a/src/datavisualizationqml2/designer/images/surface3d-icon16.png
+++ b/src/datavisualizationqml/designer/images/surface3d-icon16.png
diff --git a/src/datavisualizationqml2/designer/qtdatavisualization.metainfo b/src/datavisualizationqml/designer/qtdatavisualization.metainfo
index 60b2b2c2..60b2b2c2 100644
--- a/src/datavisualizationqml2/designer/qtdatavisualization.metainfo
+++ b/src/datavisualizationqml/designer/qtdatavisualization.metainfo
diff --git a/src/datavisualizationqml2/enumtostringmap.cpp b/src/datavisualizationqml/enumtostringmap.cpp
index e10e8bc0..e10e8bc0 100644
--- a/src/datavisualizationqml2/enumtostringmap.cpp
+++ b/src/datavisualizationqml/enumtostringmap.cpp
diff --git a/src/datavisualizationqml2/enumtostringmap_p.h b/src/datavisualizationqml/enumtostringmap_p.h
index ee613433..ee613433 100644
--- a/src/datavisualizationqml2/enumtostringmap_p.h
+++ b/src/datavisualizationqml/enumtostringmap_p.h
diff --git a/src/datavisualizationqml/foreigntypes_p.h b/src/datavisualizationqml/foreigntypes_p.h
new file mode 100644
index 00000000..9bf9b1c7
--- /dev/null
+++ b/src/datavisualizationqml/foreigntypes_p.h
@@ -0,0 +1,147 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Data Visualization module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the QtDataVisualization 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 FOREIGNTYPES_P_H
+#define FOREIGNTYPES_P_H
+
+#include <QtQml/qqml.h>
+
+#include <QtCore/qabstractitemmodel.h>
+
+#include <QtDataVisualization/q3dcamera.h>
+#include <QtDataVisualization/q3dinputhandler.h>
+#include <QtDataVisualization/q3dlight.h>
+#include <QtDataVisualization/q3dobject.h>
+#include <QtDataVisualization/q3dscene.h>
+#include <QtDataVisualization/q3dtheme.h>
+#include <QtDataVisualization/qabstract3daxis.h>
+#include <QtDataVisualization/qabstract3dinputhandler.h>
+#include <QtDataVisualization/qabstract3dseries.h>
+#include <QtDataVisualization/qabstractdataproxy.h>
+#include <QtDataVisualization/qbar3dseries.h>
+#include <QtDataVisualization/qbardataproxy.h>
+#include <QtDataVisualization/qcategory3daxis.h>
+#include <QtDataVisualization/qcustom3ditem.h>
+#include <QtDataVisualization/qcustom3dlabel.h>
+#include <QtDataVisualization/qcustom3dvolume.h>
+#include <QtDataVisualization/qheightmapsurfacedataproxy.h>
+#include <QtDataVisualization/qitemmodelbardataproxy.h>
+#include <QtDataVisualization/qitemmodelscatterdataproxy.h>
+#include <QtDataVisualization/qitemmodelsurfacedataproxy.h>
+#include <QtDataVisualization/qlogvalue3daxisformatter.h>
+#include <QtDataVisualization/qscatter3dseries.h>
+#include <QtDataVisualization/qscatterdataproxy.h>
+#include <QtDataVisualization/qsurface3dseries.h>
+#include <QtDataVisualization/qsurfacedataproxy.h>
+#include <QtDataVisualization/qtouch3dinputhandler.h>
+#include <QtDataVisualization/qvalue3daxis.h>
+#include <QtDataVisualization/qvalue3daxisformatter.h>
+
+QT_BEGIN_NAMESPACE
+
+#define DEFINE_FOREIGN_BASE_ATTRIBUTES(type, name, minor) \
+        Q_GADGET \
+        QML_NAMED_ELEMENT(name) \
+        QML_FOREIGN(type) \
+        QML_ADDED_IN_VERSION(1, minor) \
+
+#define DEFINE_FOREIGN_UNCREATABLE_TYPE(type, name) \
+    struct type##Foreign \
+    { \
+        DEFINE_FOREIGN_BASE_ATTRIBUTES(type, name, 0) \
+        QML_UNCREATABLE("Trying to create uncreatable: " #name ".") \
+    };
+
+#define DEFINE_FOREIGN_CREATABLE_TYPE(type, name, minor) \
+    struct type##Foreign \
+    { \
+        DEFINE_FOREIGN_BASE_ATTRIBUTES(type, name, minor) \
+    };
+
+#define DEFINE_FOREIGN_REPLACED_TYPE(type, name, better) \
+    struct type##Foreign \
+    { \
+        DEFINE_FOREIGN_BASE_ATTRIBUTES(type, name, 0) \
+        QML_UNCREATABLE("Trying to create uncreatable: " #name ", use " #better " instead.") \
+    };
+
+struct Q3DSceneForeign
+{
+    Q_GADGET
+    QML_ANONYMOUS
+    QML_ADDED_IN_VERSION(1, 0)
+    QML_FOREIGN(Q3DScene)
+};
+
+DEFINE_FOREIGN_CREATABLE_TYPE(Q3DCamera, Camera3D, 0)
+DEFINE_FOREIGN_CREATABLE_TYPE(Q3DLight, Light3D, 0)
+DEFINE_FOREIGN_CREATABLE_TYPE(QCategory3DAxis, CategoryAxis3D, 0)
+DEFINE_FOREIGN_CREATABLE_TYPE(QHeightMapSurfaceDataProxy, HeightMapSurfaceDataProxy, 0)
+DEFINE_FOREIGN_CREATABLE_TYPE(QItemModelBarDataProxy, ItemModelBarDataProxy, 0)
+DEFINE_FOREIGN_CREATABLE_TYPE(QItemModelScatterDataProxy, ItemModelScatterDataProxy, 0)
+DEFINE_FOREIGN_CREATABLE_TYPE(QItemModelSurfaceDataProxy, ItemModelSurfaceDataProxy, 0)
+DEFINE_FOREIGN_CREATABLE_TYPE(QValue3DAxis, ValueAxis3D, 0)
+
+DEFINE_FOREIGN_CREATABLE_TYPE(QCustom3DItem, Custom3DItem, 1)
+DEFINE_FOREIGN_CREATABLE_TYPE(QCustom3DLabel, Custom3DLabel, 1)
+DEFINE_FOREIGN_CREATABLE_TYPE(QLogValue3DAxisFormatter, LogValueAxis3DFormatter, 1)
+DEFINE_FOREIGN_CREATABLE_TYPE(QValue3DAxisFormatter, ValueAxis3DFormatter, 1)
+
+DEFINE_FOREIGN_CREATABLE_TYPE(Q3DInputHandler, InputHandler3D, 2)
+DEFINE_FOREIGN_CREATABLE_TYPE(QCustom3DVolume, Custom3DVolume, 2)
+DEFINE_FOREIGN_CREATABLE_TYPE(QTouch3DInputHandler, TouchInputHandler3D, 2)
+
+DEFINE_FOREIGN_REPLACED_TYPE(Q3DTheme, Q3DTheme, Theme3D)
+DEFINE_FOREIGN_REPLACED_TYPE(QBar3DSeries, QBar3DSeries, Bar3DSeries)
+DEFINE_FOREIGN_REPLACED_TYPE(QScatter3DSeries, QScatter3DSeries, Scatter3DSeries)
+DEFINE_FOREIGN_REPLACED_TYPE(QSurface3DSeries, QSurface3DSeries, Surface3DSeries)
+
+DEFINE_FOREIGN_UNCREATABLE_TYPE(Q3DObject, Object3D)
+DEFINE_FOREIGN_UNCREATABLE_TYPE(QAbstract3DAxis, AbstractAxis3D)
+DEFINE_FOREIGN_UNCREATABLE_TYPE(QAbstract3DInputHandler, AbstractInputHandler3D)
+DEFINE_FOREIGN_UNCREATABLE_TYPE(QAbstract3DSeries, Abstract3DSeries)
+DEFINE_FOREIGN_UNCREATABLE_TYPE(QAbstractDataProxy, AbstractDataProxy)
+DEFINE_FOREIGN_UNCREATABLE_TYPE(QAbstractItemModel, AbstractItemModel)
+DEFINE_FOREIGN_UNCREATABLE_TYPE(QBarDataProxy, BarDataProxy)
+DEFINE_FOREIGN_UNCREATABLE_TYPE(QScatterDataProxy, ScatterDataProxy)
+DEFINE_FOREIGN_UNCREATABLE_TYPE(QSurfaceDataProxy, SurfaceDataProxy)
+
+QT_END_NAMESPACE
+
+#endif // FOREIGNTYPES_P_H
diff --git a/src/datavisualizationqml2/glstatestore.cpp b/src/datavisualizationqml/glstatestore.cpp
index dfb4266f..dfb4266f 100644
--- a/src/datavisualizationqml2/glstatestore.cpp
+++ b/src/datavisualizationqml/glstatestore.cpp
diff --git a/src/datavisualizationqml2/glstatestore_p.h b/src/datavisualizationqml/glstatestore_p.h
index f5aa0bdd..f5aa0bdd 100644
--- a/src/datavisualizationqml2/glstatestore_p.h
+++ b/src/datavisualizationqml/glstatestore_p.h
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
deleted file mode 100644
index 9a92e42c..00000000
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Data Visualization module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "declarativebars_p.h"
-#include "declarativescatter_p.h"
-#include "declarativesurface_p.h"
-#include "qitemmodelbardataproxy.h"
-#include "qitemmodelscatterdataproxy.h"
-#include "qitemmodelsurfacedataproxy.h"
-#include "qheightmapsurfacedataproxy.h"
-#include "qvalue3daxis.h"
-#include "qvalue3daxisformatter.h"
-#include "qlogvalue3daxisformatter.h"
-#include "qcategory3daxis.h"
-#include "q3dobject.h"
-#include "q3dcamera.h"
-#include "q3dscene.h"
-#include "q3dlight.h"
-#include "qabstract3dseries.h"
-#include "qbar3dseries.h"
-#include "qscatter3dseries.h"
-#include "qsurface3dseries.h"
-#include "declarativeseries_p.h"
-#include "q3dtheme.h"
-#include "declarativetheme_p.h"
-#include "q3dinputhandler.h"
-#include "qtouch3dinputhandler.h"
-#include "declarativecolor_p.h"
-#include "declarativescene_p.h"
-#include "qcustom3ditem.h"
-#include "qcustom3dlabel.h"
-#include "qcustom3dvolume.h"
-#include "datavisualizationqml2_plugin.h"
-
-#include <QtQml>
-
-
-QML_DECLARE_TYPE(AbstractDeclarative)
-QML_DECLARE_TYPE(DeclarativeBars)
-QML_DECLARE_TYPE(DeclarativeScatter)
-QML_DECLARE_TYPE(DeclarativeSurface)
-
-QML_DECLARE_TYPE(QAbstractItemModel)
-
-QML_DECLARE_TYPE(QAbstract3DAxis)
-QML_DECLARE_TYPE(QCategory3DAxis)
-QML_DECLARE_TYPE(QValue3DAxis)
-QML_DECLARE_TYPE(QValue3DAxisFormatter)
-QML_DECLARE_TYPE(QLogValue3DAxisFormatter)
-
-QML_DECLARE_TYPE(Q3DScene)
-QML_DECLARE_TYPE(Declarative3DScene)
-QML_DECLARE_TYPE(Q3DObject)
-QML_DECLARE_TYPE(Q3DCamera)
-QML_DECLARE_TYPE(Q3DLight)
-
-QML_DECLARE_TYPE(QAbstractDataProxy)
-QML_DECLARE_TYPE(QBarDataProxy)
-QML_DECLARE_TYPE(QItemModelBarDataProxy)
-QML_DECLARE_TYPE(QScatterDataProxy)
-QML_DECLARE_TYPE(QItemModelScatterDataProxy)
-QML_DECLARE_TYPE(QSurfaceDataProxy)
-QML_DECLARE_TYPE(QItemModelSurfaceDataProxy)
-QML_DECLARE_TYPE(QHeightMapSurfaceDataProxy)
-
-QML_DECLARE_TYPE(QAbstract3DSeries)
-QML_DECLARE_TYPE(QBar3DSeries)
-QML_DECLARE_TYPE(QScatter3DSeries)
-QML_DECLARE_TYPE(QSurface3DSeries)
-QML_DECLARE_TYPE(DeclarativeBar3DSeries)
-QML_DECLARE_TYPE(DeclarativeScatter3DSeries)
-QML_DECLARE_TYPE(DeclarativeSurface3DSeries)
-
-QML_DECLARE_TYPE(ColorGradientStop)
-QML_DECLARE_TYPE(ColorGradient)
-
-QML_DECLARE_TYPE(DeclarativeColor)
-
-QML_DECLARE_TYPE(Q3DTheme)
-QML_DECLARE_TYPE(DeclarativeTheme3D)
-
-QML_DECLARE_TYPE(QAbstract3DInputHandler)
-QML_DECLARE_TYPE(Q3DInputHandler)
-QML_DECLARE_TYPE(QTouch3DInputHandler)
-
-QML_DECLARE_TYPE(QCustom3DItem)
-QML_DECLARE_TYPE(QCustom3DLabel)
-QML_DECLARE_TYPE(QCustom3DVolume)
-
-QT_BEGIN_NAMESPACE
-
-
-
-
-void QtDataVisualizationQml2Plugin::registerTypes(const char *uri)
-{
-    // @uri QtDataVisualization
-
-    // QtDataVisualization 1.0
-
-    qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
-                                                   QLatin1String("Trying to create uncreatable: AbstractItemModel."));
-    qmlRegisterUncreatableType<QAbstract3DAxis>(uri, 1, 0, "AbstractAxis3D",
-                                                QLatin1String("Trying to create uncreatable: AbstractAxis."));
-    qmlRegisterUncreatableType<QAbstractDataProxy>(uri, 1, 0, "AbstractDataProxy",
-                                                   QLatin1String("Trying to create uncreatable: AbstractDataProxy."));
-    qmlRegisterUncreatableType<QBarDataProxy>(uri, 1, 0, "BarDataProxy",
-                                              QLatin1String("Trying to create uncreatable: BarDataProxy."));
-    qmlRegisterUncreatableType<QScatterDataProxy>(uri, 1, 0, "ScatterDataProxy",
-                                                  QLatin1String("Trying to create uncreatable: ScatterDataProxy."));
-    qmlRegisterUncreatableType<QSurfaceDataProxy>(uri, 1, 0, "SurfaceDataProxy",
-                                                  QLatin1String("Trying to create uncreatable: SurfaceDataProxy."));
-    qmlRegisterUncreatableType<AbstractDeclarative>(uri, 1, 0, "AbstractGraph3D",
-                                                    QLatin1String("Trying to create uncreatable: AbstractGraph3D."));
-    qmlRegisterUncreatableType<Declarative3DScene>(uri, 1, 0, "Scene3D",
-                                                   QLatin1String("Trying to create uncreatable: Scene3D."));
-    qmlRegisterUncreatableType<QAbstract3DSeries>(uri, 1, 0, "Abstract3DSeries",
-                                                  QLatin1String("Trying to create uncreatable: Abstract3DSeries."));
-    qmlRegisterUncreatableType<QBar3DSeries>(uri, 1, 0, "QBar3DSeries",
-                                             QLatin1String("Trying to create uncreatable: QBar3DSeries, use Bar3DSeries instead."));
-    qmlRegisterUncreatableType<QScatter3DSeries>(uri, 1, 0, "QScatter3DSeries",
-                                                 QLatin1String("Trying to create uncreatable: QScatter3DSeries, use Scatter3DSeries instead."));
-    qmlRegisterUncreatableType<QSurface3DSeries>(uri, 1, 0, "QSurface3DSeries",
-                                                 QLatin1String("Trying to create uncreatable: QSurface3DSeries, use Surface3DSeries instead."));
-    qmlRegisterUncreatableType<Q3DTheme>(uri, 1, 0, "Q3DTheme",
-                                         QLatin1String("Trying to create uncreatable: Q3DTheme, use Theme3D instead."));
-    qmlRegisterUncreatableType<QAbstract3DInputHandler>(uri, 1, 0, "AbstractInputHandler3D",
-                                                        QLatin1String("Trying to create uncreatable: AbstractInputHandler3D."));
-    qmlRegisterUncreatableType<Q3DObject>(uri, 1, 0, "Object3D",
-                                          QLatin1String("Trying to create uncreatable: Object3D."));
-
-    qmlRegisterType<DeclarativeBars>(uri, 1, 0, "Bars3D");
-    qmlRegisterType<DeclarativeScatter>(uri, 1, 0, "Scatter3D");
-    qmlRegisterType<DeclarativeSurface>(uri, 1, 0, "Surface3D");
-
-    qmlRegisterType<QValue3DAxis>(uri, 1, 0, "ValueAxis3D");
-    qmlRegisterType<QCategory3DAxis>(uri, 1, 0, "CategoryAxis3D");
-
-    qmlRegisterType<Q3DCamera>(uri, 1, 0, "Camera3D");
-    qmlRegisterType<Q3DLight>(uri, 1, 0, "Light3D");
-
-    qmlRegisterType<QItemModelBarDataProxy>(uri, 1, 0, "ItemModelBarDataProxy");
-    qmlRegisterType<QItemModelScatterDataProxy>(uri, 1, 0, "ItemModelScatterDataProxy");
-    qmlRegisterType<QItemModelSurfaceDataProxy>(uri, 1, 0, "ItemModelSurfaceDataProxy");
-    qmlRegisterType<QHeightMapSurfaceDataProxy>(uri, 1, 0, "HeightMapSurfaceDataProxy");
-
-    qmlRegisterType<ColorGradientStop>(uri, 1, 0, "ColorGradientStop");
-    qmlRegisterType<ColorGradient>(uri, 1, 0, "ColorGradient");
-
-    qmlRegisterType<DeclarativeColor>(uri, 1, 0, "ThemeColor");
-    qmlRegisterType<DeclarativeTheme3D>(uri, 1, 0, "Theme3D");
-
-    qmlRegisterType<DeclarativeBar3DSeries>(uri, 1, 0, "Bar3DSeries");
-    qmlRegisterType<DeclarativeScatter3DSeries>(uri, 1, 0, "Scatter3DSeries");
-    qmlRegisterType<DeclarativeSurface3DSeries>(uri, 1, 0, "Surface3DSeries");
-
-    qRegisterMetaType<QAbstract3DGraph::ShadowQuality>("QAbstract3DGraph::ShadowQuality");
-
-    // QtDataVisualization 1.1
-
-    // New revisions
-    qmlRegisterUncreatableType<QAbstract3DAxis, 1>(uri, 1, 1, "AbstractAxis3D",
-                                                   QLatin1String("Trying to create uncreatable: AbstractAxis."));
-    qmlRegisterUncreatableType<QAbstract3DSeries, 1>(uri, 1, 1, "Abstract3DSeries",
-                                                     QLatin1String("Trying to create uncreatable: Abstract3DSeries."));
-    qmlRegisterUncreatableType<AbstractDeclarative, 1>(uri, 1, 1, "AbstractGraph3D",
-                                                       QLatin1String("Trying to create uncreatable: AbstractGraph3D."));
-
-    qmlRegisterType<QValue3DAxis, 1>(uri, 1, 1, "ValueAxis3D");
-    qmlRegisterType<QItemModelBarDataProxy, 1>(uri, 1, 1, "ItemModelBarDataProxy");
-    qmlRegisterType<QItemModelSurfaceDataProxy, 1>(uri, 1, 1, "ItemModelSurfaceDataProxy");
-    qmlRegisterType<QItemModelScatterDataProxy, 1>(uri, 1, 1, "ItemModelScatterDataProxy");
-
-    // New types
-    qmlRegisterType<QValue3DAxisFormatter>(uri, 1, 1, "ValueAxis3DFormatter");
-    qmlRegisterType<QLogValue3DAxisFormatter>(uri, 1, 1, "LogValueAxis3DFormatter");
-    qmlRegisterType<QCustom3DItem>(uri, 1, 1, "Custom3DItem");
-    qmlRegisterType<QCustom3DLabel>(uri, 1, 1, "Custom3DLabel");
-
-    // New metatypes
-    qRegisterMetaType<QAbstract3DGraph::ElementType>("QAbstract3DGraph::ElementType");
-
-    // QtDataVisualization 1.2
-
-    // New revisions
-    qmlRegisterUncreatableType<AbstractDeclarative, 2>(uri, 1, 2, "AbstractGraph3D",
-                                                       QLatin1String("Trying to create uncreatable: AbstractGraph3D."));
-    qmlRegisterRevision<Q3DScene, 1>(uri, 1, 2);
-    qmlRegisterUncreatableType<Declarative3DScene, 1>(uri, 1, 2, "Scene3D",
-                                                      QLatin1String("Trying to create uncreatable: Scene3D."));
-    qmlRegisterType<DeclarativeSurface, 1>(uri, 1, 2, "Surface3D");
-    qmlRegisterType<Q3DCamera, 1>(uri, 1, 2, "Camera3D");
-    qmlRegisterType<QCustom3DItem, 1>(uri, 1, 2, "Custom3DItem");
-    qmlRegisterType<DeclarativeBars, 1>(uri, 1, 2, "Bars3D");
-
-    // New types
-    qmlRegisterType<Q3DInputHandler>(uri, 1, 2, "InputHandler3D");
-    qmlRegisterType<QTouch3DInputHandler>(uri, 1, 2, "TouchInputHandler3D");
-    qmlRegisterType<QCustom3DVolume>(uri, 1, 2, "Custom3DVolume");
-
-    // QtDataVisualization 1.3
-
-    // New revisions
-    qmlRegisterType<Q3DLight, 1>(uri, 1, 3, "Light3D");
-
-    // The minor version used to be the current Qt 5 minor. For compatibility it is the last
-    // Qt 5 release.
-    qmlRegisterModule(uri, 1, 15);
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
deleted file mode 100644
index 9c6074ce..00000000
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Data Visualization module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef DATAVISUALIZATIONQML2_PLUGIN_H
-#define DATAVISUALIZATIONQML2_PLUGIN_H
-
-#include <QtQml/QQmlExtensionPlugin>
-#include "datavisualizationglobal_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QtDataVisualizationQml2Plugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
-
-public:
-    QtDataVisualizationQml2Plugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
-    void registerTypes(const char *uri) override;
-};
-
-QT_END_NAMESPACE
-
-#endif // DATAVISUALIZATIONQML2_PLUGIN_H
-
diff --git a/src/datavisualizationqml2/plugins.qmltypes b/src/datavisualizationqml2/plugins.qmltypes
deleted file mode 100644
index 69a48706..00000000
--- a/src/datavisualizationqml2/plugins.qmltypes
+++ /dev/null
@@ -1,2375 +0,0 @@
-import QtQuick.tooling 1.2
-
-// 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 -defaultplatform QtDataVisualization 1.14'
-
-Module {
-    dependencies: ["QtQuick 2.0"]
-    Component {
-        name: "QAbstractItemModel"
-        prototype: "QObject"
-        exports: ["QtDataVisualization/AbstractItemModel 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Enum {
-            name: "LayoutChangeHint"
-            values: {
-                "NoLayoutChangeHint": 0,
-                "VerticalSortHint": 1,
-                "HorizontalSortHint": 2
-            }
-        }
-        Enum {
-            name: "CheckIndexOption"
-            values: {
-                "NoOption": 0,
-                "IndexIsValid": 1,
-                "DoNotUseParent": 2,
-                "ParentIsInvalid": 4
-            }
-        }
-        Signal {
-            name: "dataChanged"
-            Parameter { name: "topLeft"; type: "QModelIndex" }
-            Parameter { name: "bottomRight"; type: "QModelIndex" }
-            Parameter { name: "roles"; type: "QVector<int>" }
-        }
-        Signal {
-            name: "dataChanged"
-            Parameter { name: "topLeft"; type: "QModelIndex" }
-            Parameter { name: "bottomRight"; type: "QModelIndex" }
-        }
-        Signal {
-            name: "headerDataChanged"
-            Parameter { name: "orientation"; type: "Qt::Orientation" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "layoutChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-            Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
-        }
-        Signal {
-            name: "layoutChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-        }
-        Signal { name: "layoutChanged" }
-        Signal {
-            name: "layoutAboutToBeChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-            Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
-        }
-        Signal {
-            name: "layoutAboutToBeChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-        }
-        Signal { name: "layoutAboutToBeChanged" }
-        Signal {
-            name: "rowsAboutToBeInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "rowsInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "rowsAboutToBeRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "rowsRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsAboutToBeInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsAboutToBeRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal { name: "modelAboutToBeReset" }
-        Signal { name: "modelReset" }
-        Signal {
-            name: "rowsAboutToBeMoved"
-            Parameter { name: "sourceParent"; type: "QModelIndex" }
-            Parameter { name: "sourceStart"; type: "int" }
-            Parameter { name: "sourceEnd"; type: "int" }
-            Parameter { name: "destinationParent"; type: "QModelIndex" }
-            Parameter { name: "destinationRow"; type: "int" }
-        }
-        Signal {
-            name: "rowsMoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-            Parameter { name: "destination"; type: "QModelIndex" }
-            Parameter { name: "row"; type: "int" }
-        }
-        Signal {
-            name: "columnsAboutToBeMoved"
-            Parameter { name: "sourceParent"; type: "QModelIndex" }
-            Parameter { name: "sourceStart"; type: "int" }
-            Parameter { name: "sourceEnd"; type: "int" }
-            Parameter { name: "destinationParent"; type: "QModelIndex" }
-            Parameter { name: "destinationColumn"; type: "int" }
-        }
-        Signal {
-            name: "columnsMoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-            Parameter { name: "destination"; type: "QModelIndex" }
-            Parameter { name: "column"; type: "int" }
-        }
-        Method { name: "submit"; type: "bool" }
-        Method { name: "revert" }
-        Method {
-            name: "hasIndex"
-            type: "bool"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "hasIndex"
-            type: "bool"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-        }
-        Method {
-            name: "index"
-            type: "QModelIndex"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "index"
-            type: "QModelIndex"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-        }
-        Method {
-            name: "parent"
-            type: "QModelIndex"
-            Parameter { name: "child"; type: "QModelIndex" }
-        }
-        Method {
-            name: "sibling"
-            type: "QModelIndex"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-            Parameter { name: "idx"; type: "QModelIndex" }
-        }
-        Method {
-            name: "rowCount"
-            type: "int"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method { name: "rowCount"; type: "int" }
-        Method {
-            name: "columnCount"
-            type: "int"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method { name: "columnCount"; type: "int" }
-        Method {
-            name: "hasChildren"
-            type: "bool"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method { name: "hasChildren"; type: "bool" }
-        Method {
-            name: "data"
-            type: "QVariant"
-            Parameter { name: "index"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-        }
-        Method {
-            name: "data"
-            type: "QVariant"
-            Parameter { name: "index"; type: "QModelIndex" }
-        }
-        Method {
-            name: "setData"
-            type: "bool"
-            Parameter { name: "index"; type: "QModelIndex" }
-            Parameter { name: "value"; type: "QVariant" }
-            Parameter { name: "role"; type: "int" }
-        }
-        Method {
-            name: "setData"
-            type: "bool"
-            Parameter { name: "index"; type: "QModelIndex" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-        Method {
-            name: "headerData"
-            type: "QVariant"
-            Parameter { name: "section"; type: "int" }
-            Parameter { name: "orientation"; type: "Qt::Orientation" }
-            Parameter { name: "role"; type: "int" }
-        }
-        Method {
-            name: "headerData"
-            type: "QVariant"
-            Parameter { name: "section"; type: "int" }
-            Parameter { name: "orientation"; type: "Qt::Orientation" }
-        }
-        Method {
-            name: "fetchMore"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "canFetchMore"
-            type: "bool"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "flags"
-            type: "Qt::ItemFlags"
-            Parameter { name: "index"; type: "QModelIndex" }
-        }
-        Method {
-            name: "match"
-            type: "QModelIndexList"
-            Parameter { name: "start"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-            Parameter { name: "value"; type: "QVariant" }
-            Parameter { name: "hits"; type: "int" }
-            Parameter { name: "flags"; type: "Qt::MatchFlags" }
-        }
-        Method {
-            name: "match"
-            type: "QModelIndexList"
-            Parameter { name: "start"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-            Parameter { name: "value"; type: "QVariant" }
-            Parameter { name: "hits"; type: "int" }
-        }
-        Method {
-            name: "match"
-            type: "QModelIndexList"
-            Parameter { name: "start"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::AbstractDeclarative"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: [
-            "QtDataVisualization/AbstractGraph3D 1.0",
-            "QtDataVisualization/AbstractGraph3D 1.1",
-            "QtDataVisualization/AbstractGraph3D 1.2"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 1, 2]
-        Enum {
-            name: "SelectionFlag"
-            values: {
-                "SelectionNone": 0,
-                "SelectionItem": 1,
-                "SelectionRow": 2,
-                "SelectionItemAndRow": 3,
-                "SelectionColumn": 4,
-                "SelectionItemAndColumn": 5,
-                "SelectionRowAndColumn": 6,
-                "SelectionItemRowAndColumn": 7,
-                "SelectionSlice": 8,
-                "SelectionMultiSeries": 16
-            }
-        }
-        Enum {
-            name: "SelectionFlags"
-            values: {
-                "SelectionNone": 0,
-                "SelectionItem": 1,
-                "SelectionRow": 2,
-                "SelectionItemAndRow": 3,
-                "SelectionColumn": 4,
-                "SelectionItemAndColumn": 5,
-                "SelectionRowAndColumn": 6,
-                "SelectionItemRowAndColumn": 7,
-                "SelectionSlice": 8,
-                "SelectionMultiSeries": 16
-            }
-        }
-        Enum {
-            name: "ShadowQuality"
-            values: {
-                "ShadowQualityNone": 0,
-                "ShadowQualityLow": 1,
-                "ShadowQualityMedium": 2,
-                "ShadowQualityHigh": 3,
-                "ShadowQualitySoftLow": 4,
-                "ShadowQualitySoftMedium": 5,
-                "ShadowQualitySoftHigh": 6
-            }
-        }
-        Enum {
-            name: "ElementType"
-            values: {
-                "ElementNone": 0,
-                "ElementSeries": 1,
-                "ElementAxisXLabel": 2,
-                "ElementAxisYLabel": 3,
-                "ElementAxisZLabel": 4,
-                "ElementCustomItem": 5
-            }
-        }
-        Enum {
-            name: "RenderingMode"
-            values: {
-                "RenderDirectToBackground": 0,
-                "RenderDirectToBackground_NoClear": 1,
-                "RenderIndirect": 2
-            }
-        }
-        Enum {
-            name: "OptimizationHint"
-            values: {
-                "OptimizationDefault": 0,
-                "OptimizationStatic": 1
-            }
-        }
-        Enum {
-            name: "OptimizationHints"
-            values: {
-                "OptimizationDefault": 0,
-                "OptimizationStatic": 1
-            }
-        }
-        Property { name: "selectionMode"; type: "SelectionFlags" }
-        Property { name: "shadowQuality"; type: "ShadowQuality" }
-        Property { name: "shadowsSupported"; type: "bool"; isReadonly: true }
-        Property { name: "msaaSamples"; type: "int" }
-        Property { name: "scene"; type: "Declarative3DScene"; isReadonly: true; isPointer: true }
-        Property { name: "inputHandler"; type: "QAbstract3DInputHandler"; isPointer: true }
-        Property { name: "theme"; type: "Q3DTheme"; isPointer: true }
-        Property { name: "renderingMode"; type: "RenderingMode" }
-        Property { name: "measureFps"; revision: 1; type: "bool" }
-        Property { name: "currentFps"; revision: 1; type: "double"; isReadonly: true }
-        Property {
-            name: "customItemList"
-            revision: 1
-            type: "QCustom3DItem"
-            isList: true
-            isReadonly: true
-        }
-        Property { name: "orthoProjection"; revision: 1; type: "bool" }
-        Property { name: "selectedElement"; revision: 1; type: "ElementType"; isReadonly: true }
-        Property { name: "aspectRatio"; revision: 1; type: "double" }
-        Property { name: "optimizationHints"; revision: 1; type: "OptimizationHints" }
-        Property { name: "polar"; revision: 2; type: "bool" }
-        Property { name: "radialLabelOffset"; revision: 2; type: "float" }
-        Property { name: "horizontalAspectRatio"; revision: 2; type: "double" }
-        Property { name: "reflection"; revision: 2; type: "bool" }
-        Property { name: "reflectivity"; revision: 2; type: "double" }
-        Property { name: "locale"; revision: 2; type: "QLocale" }
-        Property { name: "queriedGraphPosition"; revision: 2; type: "QVector3D"; isReadonly: true }
-        Property { name: "margin"; revision: 2; type: "double" }
-        Signal {
-            name: "selectionModeChanged"
-            Parameter { name: "mode"; type: "AbstractDeclarative::SelectionFlags" }
-        }
-        Signal {
-            name: "shadowQualityChanged"
-            Parameter { name: "quality"; type: "AbstractDeclarative::ShadowQuality" }
-        }
-        Signal {
-            name: "shadowsSupportedChanged"
-            Parameter { name: "supported"; type: "bool" }
-        }
-        Signal {
-            name: "msaaSamplesChanged"
-            Parameter { name: "samples"; type: "int" }
-        }
-        Signal {
-            name: "sceneChanged"
-            Parameter { name: "scene"; type: "Q3DScene"; isPointer: true }
-        }
-        Signal {
-            name: "inputHandlerChanged"
-            Parameter { name: "inputHandler"; type: "QAbstract3DInputHandler"; isPointer: true }
-        }
-        Signal {
-            name: "themeChanged"
-            Parameter { name: "theme"; type: "Q3DTheme"; isPointer: true }
-        }
-        Signal {
-            name: "renderingModeChanged"
-            Parameter { name: "mode"; type: "AbstractDeclarative::RenderingMode" }
-        }
-        Signal {
-            name: "measureFpsChanged"
-            revision: 1
-            Parameter { name: "enabled"; type: "bool" }
-        }
-        Signal {
-            name: "currentFpsChanged"
-            revision: 1
-            Parameter { name: "fps"; type: "double" }
-        }
-        Signal {
-            name: "selectedElementChanged"
-            revision: 1
-            Parameter { name: "type"; type: "AbstractDeclarative::ElementType" }
-        }
-        Signal {
-            name: "orthoProjectionChanged"
-            revision: 1
-            Parameter { name: "enabled"; type: "bool" }
-        }
-        Signal {
-            name: "aspectRatioChanged"
-            revision: 1
-            Parameter { name: "ratio"; type: "double" }
-        }
-        Signal {
-            name: "optimizationHintsChanged"
-            revision: 1
-            Parameter { name: "hints"; type: "AbstractDeclarative::OptimizationHints" }
-        }
-        Signal {
-            name: "polarChanged"
-            revision: 2
-            Parameter { name: "enabled"; type: "bool" }
-        }
-        Signal {
-            name: "radialLabelOffsetChanged"
-            revision: 2
-            Parameter { name: "offset"; type: "float" }
-        }
-        Signal {
-            name: "horizontalAspectRatioChanged"
-            revision: 2
-            Parameter { name: "ratio"; type: "double" }
-        }
-        Signal {
-            name: "reflectionChanged"
-            revision: 2
-            Parameter { name: "enabled"; type: "bool" }
-        }
-        Signal {
-            name: "reflectivityChanged"
-            revision: 2
-            Parameter { name: "reflectivity"; type: "double" }
-        }
-        Signal {
-            name: "localeChanged"
-            revision: 2
-            Parameter { name: "locale"; type: "QLocale" }
-        }
-        Signal {
-            name: "queriedGraphPositionChanged"
-            revision: 2
-            Parameter { name: "data"; type: "QVector3D" }
-        }
-        Signal {
-            name: "marginChanged"
-            revision: 2
-            Parameter { name: "margin"; type: "double" }
-        }
-        Method {
-            name: "handleAxisXChanged"
-            Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true }
-        }
-        Method {
-            name: "handleAxisYChanged"
-            Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true }
-        }
-        Method {
-            name: "handleAxisZChanged"
-            Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true }
-        }
-        Method {
-            name: "windowDestroyed"
-            Parameter { name: "obj"; type: "QObject"; isPointer: true }
-        }
-        Method { name: "destroyContext" }
-        Method { name: "clearSelection" }
-        Method {
-            name: "addCustomItem"
-            revision: 1
-            type: "int"
-            Parameter { name: "item"; type: "QCustom3DItem"; isPointer: true }
-        }
-        Method { name: "removeCustomItems"; revision: 1 }
-        Method {
-            name: "removeCustomItem"
-            revision: 1
-            Parameter { name: "item"; type: "QCustom3DItem"; isPointer: true }
-        }
-        Method {
-            name: "removeCustomItemAt"
-            revision: 1
-            Parameter { name: "position"; type: "QVector3D" }
-        }
-        Method {
-            name: "releaseCustomItem"
-            revision: 1
-            Parameter { name: "item"; type: "QCustom3DItem"; isPointer: true }
-        }
-        Method { name: "selectedLabelIndex"; revision: 1; type: "int" }
-        Method { name: "selectedAxis"; revision: 1; type: "QAbstract3DAxis*" }
-        Method { name: "selectedCustomItemIndex"; revision: 1; type: "int" }
-        Method { name: "selectedCustomItem"; revision: 1; type: "QCustom3DItem*" }
-    }
-    Component {
-        name: "QtDataVisualization::ColorGradient"
-        defaultProperty: "stops"
-        prototype: "QObject"
-        exports: ["QtDataVisualization/ColorGradient 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "stops"; type: "ColorGradientStop"; isList: true; isReadonly: true }
-        Signal { name: "updated" }
-    }
-    Component {
-        name: "QtDataVisualization::ColorGradientStop"
-        prototype: "QObject"
-        exports: ["QtDataVisualization/ColorGradientStop 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "position"; type: "double" }
-        Property { name: "color"; type: "QColor" }
-        Signal {
-            name: "positionChanged"
-            Parameter { name: "position"; type: "double" }
-        }
-        Signal {
-            name: "colorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::Declarative3DScene"
-        prototype: "QtDataVisualization::Q3DScene"
-        exports: [
-            "QtDataVisualization/Scene3D 1.0",
-            "QtDataVisualization/Scene3D 1.2"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 1]
-        Property { name: "selectionQueryPosition"; type: "QPointF" }
-        Property { name: "invalidSelectionPoint"; type: "QPoint"; isReadonly: true }
-        Signal {
-            name: "selectionQueryPositionChanged"
-            Parameter { name: "position"; type: "QPointF" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::DeclarativeBar3DSeries"
-        defaultProperty: "seriesChildren"
-        prototype: "QtDataVisualization::QBar3DSeries"
-        exports: ["QtDataVisualization/Bar3DSeries 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "selectedBar"; type: "QPointF" }
-        Property { name: "invalidSelectionPosition"; type: "QPointF"; isReadonly: true }
-        Property { name: "baseGradient"; type: "ColorGradient"; isPointer: true }
-        Property { name: "singleHighlightGradient"; type: "ColorGradient"; isPointer: true }
-        Property { name: "multiHighlightGradient"; type: "ColorGradient"; isPointer: true }
-        Signal {
-            name: "selectedBarChanged"
-            Parameter { name: "position"; type: "QPointF" }
-        }
-        Signal {
-            name: "baseGradientChanged"
-            Parameter { name: "gradient"; type: "ColorGradient"; isPointer: true }
-        }
-        Signal {
-            name: "singleHighlightGradientChanged"
-            Parameter { name: "gradient"; type: "ColorGradient"; isPointer: true }
-        }
-        Signal {
-            name: "multiHighlightGradientChanged"
-            Parameter { name: "gradient"; type: "ColorGradient"; isPointer: true }
-        }
-        Method { name: "handleBaseGradientUpdate" }
-        Method { name: "handleSingleHighlightGradientUpdate" }
-        Method { name: "handleMultiHighlightGradientUpdate" }
-    }
-    Component {
-        name: "QtDataVisualization::DeclarativeBars"
-        defaultProperty: "seriesList"
-        prototype: "QtDataVisualization::AbstractDeclarative"
-        exports: [
-            "QtDataVisualization/Bars3D 1.0",
-            "QtDataVisualization/Bars3D 1.2"
-        ]
-        exportMetaObjectRevisions: [0, 1]
-        Property { name: "rowAxis"; type: "QCategory3DAxis"; isPointer: true }
-        Property { name: "valueAxis"; type: "QValue3DAxis"; isPointer: true }
-        Property { name: "columnAxis"; type: "QCategory3DAxis"; isPointer: true }
-        Property { name: "multiSeriesUniform"; type: "bool" }
-        Property { name: "barThickness"; type: "float" }
-        Property { name: "barSpacing"; type: "QSizeF" }
-        Property { name: "barSpacingRelative"; type: "bool" }
-        Property { name: "seriesList"; type: "QBar3DSeries"; isList: true; isReadonly: true }
-        Property { name: "selectedSeries"; type: "QBar3DSeries"; isReadonly: true; isPointer: true }
-        Property { name: "primarySeries"; type: "QBar3DSeries"; isPointer: true }
-        Property { name: "floorLevel"; revision: 1; type: "float" }
-        Signal {
-            name: "rowAxisChanged"
-            Parameter { name: "axis"; type: "QCategory3DAxis"; isPointer: true }
-        }
-        Signal {
-            name: "valueAxisChanged"
-            Parameter { name: "axis"; type: "QValue3DAxis"; isPointer: true }
-        }
-        Signal {
-            name: "columnAxisChanged"
-            Parameter { name: "axis"; type: "QCategory3DAxis"; isPointer: true }
-        }
-        Signal {
-            name: "multiSeriesUniformChanged"
-            Parameter { name: "uniform"; type: "bool" }
-        }
-        Signal {
-            name: "barThicknessChanged"
-            Parameter { name: "thicknessRatio"; type: "float" }
-        }
-        Signal {
-            name: "barSpacingChanged"
-            Parameter { name: "spacing"; type: "QSizeF" }
-        }
-        Signal {
-            name: "barSpacingRelativeChanged"
-            Parameter { name: "relative"; type: "bool" }
-        }
-        Signal {
-            name: "meshFileNameChanged"
-            Parameter { name: "filename"; type: "string" }
-        }
-        Signal {
-            name: "primarySeriesChanged"
-            Parameter { name: "series"; type: "QBar3DSeries"; isPointer: true }
-        }
-        Signal {
-            name: "selectedSeriesChanged"
-            Parameter { name: "series"; type: "QBar3DSeries"; isPointer: true }
-        }
-        Signal {
-            name: "floorLevelChanged"
-            revision: 1
-            Parameter { name: "level"; type: "float" }
-        }
-        Method {
-            name: "handleAxisXChanged"
-            Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true }
-        }
-        Method {
-            name: "handleAxisYChanged"
-            Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true }
-        }
-        Method {
-            name: "handleAxisZChanged"
-            Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true }
-        }
-        Method {
-            name: "addSeries"
-            Parameter { name: "series"; type: "QBar3DSeries"; isPointer: true }
-        }
-        Method {
-            name: "removeSeries"
-            Parameter { name: "series"; type: "QBar3DSeries"; isPointer: true }
-        }
-        Method {
-            name: "insertSeries"
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "series"; type: "QBar3DSeries"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::DeclarativeColor"
-        prototype: "QObject"
-        exports: ["QtDataVisualization/ThemeColor 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "color"; type: "QColor" }
-        Signal {
-            name: "colorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::DeclarativeScatter"
-        defaultProperty: "seriesList"
-        prototype: "QtDataVisualization::AbstractDeclarative"
-        exports: ["QtDataVisualization/Scatter3D 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "axisX"; type: "QValue3DAxis"; isPointer: true }
-        Property { name: "axisY"; type: "QValue3DAxis"; isPointer: true }
-        Property { name: "axisZ"; type: "QValue3DAxis"; isPointer: true }
-        Property { name: "selectedSeries"; type: "QScatter3DSeries"; isReadonly: true; isPointer: true }
-        Property { name: "seriesList"; type: "QScatter3DSeries"; isList: true; isReadonly: true }
-        Signal {
-            name: "axisXChanged"
-            Parameter { name: "axis"; type: "QValue3DAxis"; isPointer: true }
-        }
-        Signal {
-            name: "axisYChanged"
-            Parameter { name: "axis"; type: "QValue3DAxis"; isPointer: true }
-        }
-        Signal {
-            name: "axisZChanged"
-            Parameter { name: "axis"; type: "QValue3DAxis"; isPointer: true }
-        }
-        Signal {
-            name: "selectedSeriesChanged"
-            Parameter { name: "series"; type: "QScatter3DSeries"; isPointer: true }
-        }
-        Method {
-            name: "handleAxisXChanged"
-            Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true }
-        }
-        Method {
-            name: "handleAxisYChanged"
-            Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true }
-        }
-        Method {
-            name: "handleAxisZChanged"
-            Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true }
-        }
-        Method {
-            name: "addSeries"
-            Parameter { name: "series"; type: "QScatter3DSeries"; isPointer: true }
-        }
-        Method {
-            name: "removeSeries"
-            Parameter { name: "series"; type: "QScatter3DSeries"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::DeclarativeScatter3DSeries"
-        defaultProperty: "seriesChildren"
-        prototype: "QtDataVisualization::QScatter3DSeries"
-        exports: ["QtDataVisualization/Scatter3DSeries 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "baseGradient"; type: "ColorGradient"; isPointer: true }
-        Property { name: "singleHighlightGradient"; type: "ColorGradient"; isPointer: true }
-        Property { name: "multiHighlightGradient"; type: "ColorGradient"; isPointer: true }
-        Property { name: "invalidSelectionIndex"; type: "int"; isReadonly: true }
-        Signal {
-            name: "baseGradientChanged"
-            Parameter { name: "gradient"; type: "ColorGradient"; isPointer: true }
-        }
-        Signal {
-            name: "singleHighlightGradientChanged"
-            Parameter { name: "gradient"; type: "ColorGradient"; isPointer: true }
-        }
-        Signal {
-            name: "multiHighlightGradientChanged"
-            Parameter { name: "gradient"; type: "ColorGradient"; isPointer: true }
-        }
-        Method { name: "handleBaseGradientUpdate" }
-        Method { name: "handleSingleHighlightGradientUpdate" }
-        Method { name: "handleMultiHighlightGradientUpdate" }
-    }
-    Component {
-        name: "QtDataVisualization::DeclarativeSurface"
-        defaultProperty: "seriesList"
-        prototype: "QtDataVisualization::AbstractDeclarative"
-        exports: [
-            "QtDataVisualization/Surface3D 1.0",
-            "QtDataVisualization/Surface3D 1.2"
-        ]
-        exportMetaObjectRevisions: [0, 1]
-        Property { name: "axisX"; type: "QValue3DAxis"; isPointer: true }
-        Property { name: "axisY"; type: "QValue3DAxis"; isPointer: true }
-        Property { name: "axisZ"; type: "QValue3DAxis"; isPointer: true }
-        Property { name: "selectedSeries"; type: "QSurface3DSeries"; isReadonly: true; isPointer: true }
-        Property { name: "seriesList"; type: "QSurface3DSeries"; isList: true; isReadonly: true }
-        Property { name: "flipHorizontalGrid"; revision: 1; type: "bool" }
-        Signal {
-            name: "axisXChanged"
-            Parameter { name: "axis"; type: "QValue3DAxis"; isPointer: true }
-        }
-        Signal {
-            name: "axisYChanged"
-            Parameter { name: "axis"; type: "QValue3DAxis"; isPointer: true }
-        }
-        Signal {
-            name: "axisZChanged"
-            Parameter { name: "axis"; type: "QValue3DAxis"; isPointer: true }
-        }
-        Signal {
-            name: "selectedSeriesChanged"
-            Parameter { name: "series"; type: "QSurface3DSeries"; isPointer: true }
-        }
-        Signal {
-            name: "flipHorizontalGridChanged"
-            revision: 1
-            Parameter { name: "flip"; type: "bool" }
-        }
-        Method {
-            name: "handleAxisXChanged"
-            Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true }
-        }
-        Method {
-            name: "handleAxisYChanged"
-            Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true }
-        }
-        Method {
-            name: "handleAxisZChanged"
-            Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true }
-        }
-        Method {
-            name: "addSeries"
-            Parameter { name: "series"; type: "QSurface3DSeries"; isPointer: true }
-        }
-        Method {
-            name: "removeSeries"
-            Parameter { name: "series"; type: "QSurface3DSeries"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::DeclarativeSurface3DSeries"
-        defaultProperty: "seriesChildren"
-        prototype: "QtDataVisualization::QSurface3DSeries"
-        exports: ["QtDataVisualization/Surface3DSeries 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "selectedPoint"; type: "QPointF" }
-        Property { name: "invalidSelectionPosition"; type: "QPointF"; isReadonly: true }
-        Property { name: "baseGradient"; type: "ColorGradient"; isPointer: true }
-        Property { name: "singleHighlightGradient"; type: "ColorGradient"; isPointer: true }
-        Property { name: "multiHighlightGradient"; type: "ColorGradient"; isPointer: true }
-        Signal {
-            name: "selectedPointChanged"
-            Parameter { name: "position"; type: "QPointF" }
-        }
-        Signal {
-            name: "baseGradientChanged"
-            Parameter { name: "gradient"; type: "ColorGradient"; isPointer: true }
-        }
-        Signal {
-            name: "singleHighlightGradientChanged"
-            Parameter { name: "gradient"; type: "ColorGradient"; isPointer: true }
-        }
-        Signal {
-            name: "multiHighlightGradientChanged"
-            Parameter { name: "gradient"; type: "ColorGradient"; isPointer: true }
-        }
-        Method { name: "handleBaseGradientUpdate" }
-        Method { name: "handleSingleHighlightGradientUpdate" }
-        Method { name: "handleMultiHighlightGradientUpdate" }
-    }
-    Component {
-        name: "QtDataVisualization::DeclarativeTheme3D"
-        defaultProperty: "themeChildren"
-        prototype: "QtDataVisualization::Q3DTheme"
-        exports: ["QtDataVisualization/Theme3D 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "themeChildren"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "baseColors"; type: "DeclarativeColor"; isList: true; isReadonly: true }
-        Property { name: "baseGradients"; type: "ColorGradient"; isList: true; isReadonly: true }
-        Property { name: "singleHighlightGradient"; type: "ColorGradient"; isPointer: true }
-        Property { name: "multiHighlightGradient"; type: "ColorGradient"; isPointer: true }
-        Signal {
-            name: "singleHighlightGradientChanged"
-            Parameter { name: "gradient"; type: "ColorGradient"; isPointer: true }
-        }
-        Signal {
-            name: "multiHighlightGradientChanged"
-            Parameter { name: "gradient"; type: "ColorGradient"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::Q3DCamera"
-        prototype: "QtDataVisualization::Q3DObject"
-        exports: [
-            "QtDataVisualization/Camera3D 1.0",
-            "QtDataVisualization/Camera3D 1.2"
-        ]
-        exportMetaObjectRevisions: [0, 1]
-        Enum {
-            name: "CameraPreset"
-            values: {
-                "CameraPresetNone": -1,
-                "CameraPresetFrontLow": 0,
-                "CameraPresetFront": 1,
-                "CameraPresetFrontHigh": 2,
-                "CameraPresetLeftLow": 3,
-                "CameraPresetLeft": 4,
-                "CameraPresetLeftHigh": 5,
-                "CameraPresetRightLow": 6,
-                "CameraPresetRight": 7,
-                "CameraPresetRightHigh": 8,
-                "CameraPresetBehindLow": 9,
-                "CameraPresetBehind": 10,
-                "CameraPresetBehindHigh": 11,
-                "CameraPresetIsometricLeft": 12,
-                "CameraPresetIsometricLeftHigh": 13,
-                "CameraPresetIsometricRight": 14,
-                "CameraPresetIsometricRightHigh": 15,
-                "CameraPresetDirectlyAbove": 16,
-                "CameraPresetDirectlyAboveCW45": 17,
-                "CameraPresetDirectlyAboveCCW45": 18,
-                "CameraPresetFrontBelow": 19,
-                "CameraPresetLeftBelow": 20,
-                "CameraPresetRightBelow": 21,
-                "CameraPresetBehindBelow": 22,
-                "CameraPresetDirectlyBelow": 23
-            }
-        }
-        Property { name: "xRotation"; type: "float" }
-        Property { name: "yRotation"; type: "float" }
-        Property { name: "zoomLevel"; type: "float" }
-        Property { name: "cameraPreset"; type: "CameraPreset" }
-        Property { name: "wrapXRotation"; type: "bool" }
-        Property { name: "wrapYRotation"; type: "bool" }
-        Property { name: "target"; revision: 1; type: "QVector3D" }
-        Property { name: "minZoomLevel"; revision: 1; type: "float" }
-        Property { name: "maxZoomLevel"; revision: 1; type: "float" }
-        Signal {
-            name: "xRotationChanged"
-            Parameter { name: "rotation"; type: "float" }
-        }
-        Signal {
-            name: "yRotationChanged"
-            Parameter { name: "rotation"; type: "float" }
-        }
-        Signal {
-            name: "zoomLevelChanged"
-            Parameter { name: "zoomLevel"; type: "float" }
-        }
-        Signal {
-            name: "cameraPresetChanged"
-            Parameter { name: "preset"; type: "Q3DCamera::CameraPreset" }
-        }
-        Signal {
-            name: "wrapXRotationChanged"
-            Parameter { name: "isEnabled"; type: "bool" }
-        }
-        Signal {
-            name: "wrapYRotationChanged"
-            Parameter { name: "isEnabled"; type: "bool" }
-        }
-        Signal {
-            name: "targetChanged"
-            revision: 1
-            Parameter { name: "target"; type: "QVector3D" }
-        }
-        Signal {
-            name: "minZoomLevelChanged"
-            revision: 1
-            Parameter { name: "zoomLevel"; type: "float" }
-        }
-        Signal {
-            name: "maxZoomLevelChanged"
-            revision: 1
-            Parameter { name: "zoomLevel"; type: "float" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::Q3DInputHandler"
-        prototype: "QtDataVisualization::QAbstract3DInputHandler"
-        exports: ["QtDataVisualization/InputHandler3D 1.2"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "rotationEnabled"; type: "bool" }
-        Property { name: "zoomEnabled"; type: "bool" }
-        Property { name: "selectionEnabled"; type: "bool" }
-        Property { name: "zoomAtTargetEnabled"; type: "bool" }
-        Signal {
-            name: "rotationEnabledChanged"
-            Parameter { name: "enable"; type: "bool" }
-        }
-        Signal {
-            name: "zoomEnabledChanged"
-            Parameter { name: "enable"; type: "bool" }
-        }
-        Signal {
-            name: "selectionEnabledChanged"
-            Parameter { name: "enable"; type: "bool" }
-        }
-        Signal {
-            name: "zoomAtTargetEnabledChanged"
-            Parameter { name: "enable"; type: "bool" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::Q3DLight"
-        prototype: "QtDataVisualization::Q3DObject"
-        exports: [
-            "QtDataVisualization/Light3D 1.0",
-            "QtDataVisualization/Light3D 1.3"
-        ]
-        exportMetaObjectRevisions: [0, 1]
-        Property { name: "autoPosition"; revision: 1; type: "bool" }
-        Signal {
-            name: "autoPositionChanged"
-            revision: 1
-            Parameter { name: "autoPosition"; type: "bool" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::Q3DObject"
-        prototype: "QObject"
-        exports: ["QtDataVisualization/Object3D 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Property { name: "parentScene"; type: "Q3DScene"; isReadonly: true; isPointer: true }
-        Property { name: "position"; type: "QVector3D" }
-        Signal {
-            name: "positionChanged"
-            Parameter { name: "position"; type: "QVector3D" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::Q3DScene"
-        prototype: "QObject"
-        Property { name: "viewport"; type: "QRect"; isReadonly: true }
-        Property { name: "primarySubViewport"; type: "QRect" }
-        Property { name: "secondarySubViewport"; type: "QRect" }
-        Property { name: "selectionQueryPosition"; type: "QPoint" }
-        Property { name: "secondarySubviewOnTop"; type: "bool" }
-        Property { name: "slicingActive"; type: "bool" }
-        Property { name: "activeCamera"; type: "Q3DCamera"; isPointer: true }
-        Property { name: "activeLight"; type: "Q3DLight"; isPointer: true }
-        Property { name: "devicePixelRatio"; type: "float" }
-        Property { name: "graphPositionQuery"; revision: 1; type: "QPoint" }
-        Signal {
-            name: "viewportChanged"
-            Parameter { name: "viewport"; type: "QRect" }
-        }
-        Signal {
-            name: "primarySubViewportChanged"
-            Parameter { name: "subViewport"; type: "QRect" }
-        }
-        Signal {
-            name: "secondarySubViewportChanged"
-            Parameter { name: "subViewport"; type: "QRect" }
-        }
-        Signal {
-            name: "secondarySubviewOnTopChanged"
-            Parameter { name: "isSecondaryOnTop"; type: "bool" }
-        }
-        Signal {
-            name: "slicingActiveChanged"
-            Parameter { name: "isSlicingActive"; type: "bool" }
-        }
-        Signal {
-            name: "activeCameraChanged"
-            Parameter { name: "camera"; type: "Q3DCamera"; isPointer: true }
-        }
-        Signal {
-            name: "activeLightChanged"
-            Parameter { name: "light"; type: "Q3DLight"; isPointer: true }
-        }
-        Signal {
-            name: "devicePixelRatioChanged"
-            Parameter { name: "pixelRatio"; type: "float" }
-        }
-        Signal {
-            name: "selectionQueryPositionChanged"
-            Parameter { name: "position"; type: "QPoint" }
-        }
-        Signal {
-            name: "graphPositionQueryChanged"
-            revision: 1
-            Parameter { name: "position"; type: "QPoint" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::Q3DTheme"
-        prototype: "QObject"
-        exports: ["QtDataVisualization/Q3DTheme 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Enum {
-            name: "ColorStyle"
-            values: {
-                "ColorStyleUniform": 0,
-                "ColorStyleObjectGradient": 1,
-                "ColorStyleRangeGradient": 2
-            }
-        }
-        Enum {
-            name: "Theme"
-            values: {
-                "ThemeQt": 0,
-                "ThemePrimaryColors": 1,
-                "ThemeDigia": 2,
-                "ThemeStoneMoss": 3,
-                "ThemeArmyBlue": 4,
-                "ThemeRetro": 5,
-                "ThemeEbony": 6,
-                "ThemeIsabelle": 7,
-                "ThemeUserDefined": 8
-            }
-        }
-        Property { name: "type"; type: "Theme" }
-        Property { name: "baseColors"; type: "QList<QColor>" }
-        Property { name: "backgroundColor"; type: "QColor" }
-        Property { name: "windowColor"; type: "QColor" }
-        Property { name: "labelTextColor"; type: "QColor" }
-        Property { name: "labelBackgroundColor"; type: "QColor" }
-        Property { name: "gridLineColor"; type: "QColor" }
-        Property { name: "singleHighlightColor"; type: "QColor" }
-        Property { name: "multiHighlightColor"; type: "QColor" }
-        Property { name: "lightColor"; type: "QColor" }
-        Property { name: "baseGradients"; type: "QList<QLinearGradient>" }
-        Property { name: "singleHighlightGradient"; type: "QLinearGradient" }
-        Property { name: "multiHighlightGradient"; type: "QLinearGradient" }
-        Property { name: "lightStrength"; type: "float" }
-        Property { name: "ambientLightStrength"; type: "float" }
-        Property { name: "highlightLightStrength"; type: "float" }
-        Property { name: "labelBorderEnabled"; type: "bool" }
-        Property { name: "font"; type: "QFont" }
-        Property { name: "backgroundEnabled"; type: "bool" }
-        Property { name: "gridEnabled"; type: "bool" }
-        Property { name: "labelBackgroundEnabled"; type: "bool" }
-        Property { name: "colorStyle"; type: "ColorStyle" }
-        Signal {
-            name: "typeChanged"
-            Parameter { name: "themeType"; type: "Q3DTheme::Theme" }
-        }
-        Signal {
-            name: "baseColorsChanged"
-            Parameter { name: "colors"; type: "QList<QColor>" }
-        }
-        Signal {
-            name: "backgroundColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "windowColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "labelTextColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "labelBackgroundColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "gridLineColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "singleHighlightColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "multiHighlightColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "lightColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "baseGradientsChanged"
-            Parameter { name: "gradients"; type: "QList<QLinearGradient>" }
-        }
-        Signal {
-            name: "singleHighlightGradientChanged"
-            Parameter { name: "gradient"; type: "QLinearGradient" }
-        }
-        Signal {
-            name: "multiHighlightGradientChanged"
-            Parameter { name: "gradient"; type: "QLinearGradient" }
-        }
-        Signal {
-            name: "lightStrengthChanged"
-            Parameter { name: "strength"; type: "float" }
-        }
-        Signal {
-            name: "ambientLightStrengthChanged"
-            Parameter { name: "strength"; type: "float" }
-        }
-        Signal {
-            name: "highlightLightStrengthChanged"
-            Parameter { name: "strength"; type: "float" }
-        }
-        Signal {
-            name: "labelBorderEnabledChanged"
-            Parameter { name: "enabled"; type: "bool" }
-        }
-        Signal {
-            name: "fontChanged"
-            Parameter { name: "font"; type: "QFont" }
-        }
-        Signal {
-            name: "backgroundEnabledChanged"
-            Parameter { name: "enabled"; type: "bool" }
-        }
-        Signal {
-            name: "gridEnabledChanged"
-            Parameter { name: "enabled"; type: "bool" }
-        }
-        Signal {
-            name: "labelBackgroundEnabledChanged"
-            Parameter { name: "enabled"; type: "bool" }
-        }
-        Signal {
-            name: "colorStyleChanged"
-            Parameter { name: "style"; type: "Q3DTheme::ColorStyle" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QAbstract3DAxis"
-        prototype: "QObject"
-        exports: [
-            "QtDataVisualization/AbstractAxis3D 1.0",
-            "QtDataVisualization/AbstractAxis3D 1.1"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 1]
-        Enum {
-            name: "AxisOrientation"
-            values: {
-                "AxisOrientationNone": 0,
-                "AxisOrientationX": 1,
-                "AxisOrientationY": 2,
-                "AxisOrientationZ": 4
-            }
-        }
-        Enum {
-            name: "AxisType"
-            values: {
-                "AxisTypeNone": 0,
-                "AxisTypeCategory": 1,
-                "AxisTypeValue": 2
-            }
-        }
-        Property { name: "title"; type: "string" }
-        Property { name: "labels"; type: "QStringList" }
-        Property { name: "orientation"; type: "AxisOrientation"; isReadonly: true }
-        Property { name: "type"; type: "AxisType"; isReadonly: true }
-        Property { name: "min"; type: "float" }
-        Property { name: "max"; type: "float" }
-        Property { name: "autoAdjustRange"; type: "bool" }
-        Property { name: "labelAutoRotation"; revision: 1; type: "float" }
-        Property { name: "titleVisible"; revision: 1; type: "bool" }
-        Property { name: "titleFixed"; revision: 1; type: "bool" }
-        Signal {
-            name: "titleChanged"
-            Parameter { name: "newTitle"; type: "string" }
-        }
-        Signal {
-            name: "orientationChanged"
-            Parameter { name: "orientation"; type: "QAbstract3DAxis::AxisOrientation" }
-        }
-        Signal {
-            name: "minChanged"
-            Parameter { name: "value"; type: "float" }
-        }
-        Signal {
-            name: "maxChanged"
-            Parameter { name: "value"; type: "float" }
-        }
-        Signal {
-            name: "rangeChanged"
-            Parameter { name: "min"; type: "float" }
-            Parameter { name: "max"; type: "float" }
-        }
-        Signal {
-            name: "autoAdjustRangeChanged"
-            Parameter { name: "autoAdjust"; type: "bool" }
-        }
-        Signal {
-            name: "labelAutoRotationChanged"
-            revision: 1
-            Parameter { name: "angle"; type: "float" }
-        }
-        Signal {
-            name: "titleVisibilityChanged"
-            revision: 1
-            Parameter { name: "visible"; type: "bool" }
-        }
-        Signal {
-            name: "titleFixedChanged"
-            revision: 1
-            Parameter { name: "fixed"; type: "bool" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QAbstract3DInputHandler"
-        prototype: "QObject"
-        exports: ["QtDataVisualization/AbstractInputHandler3D 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Enum {
-            name: "InputView"
-            values: {
-                "InputViewNone": 0,
-                "InputViewOnPrimary": 1,
-                "InputViewOnSecondary": 2
-            }
-        }
-        Property { name: "inputView"; type: "InputView" }
-        Property { name: "inputPosition"; type: "QPoint" }
-        Property { name: "scene"; type: "Q3DScene"; isPointer: true }
-        Signal {
-            name: "positionChanged"
-            Parameter { name: "position"; type: "QPoint" }
-        }
-        Signal {
-            name: "inputViewChanged"
-            Parameter { name: "view"; type: "QAbstract3DInputHandler::InputView" }
-        }
-        Signal {
-            name: "sceneChanged"
-            Parameter { name: "scene"; type: "Q3DScene"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QAbstract3DSeries"
-        prototype: "QObject"
-        exports: [
-            "QtDataVisualization/Abstract3DSeries 1.0",
-            "QtDataVisualization/Abstract3DSeries 1.1"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 1]
-        Enum {
-            name: "SeriesType"
-            values: {
-                "SeriesTypeNone": 0,
-                "SeriesTypeBar": 1,
-                "SeriesTypeScatter": 2,
-                "SeriesTypeSurface": 4
-            }
-        }
-        Enum {
-            name: "Mesh"
-            values: {
-                "MeshUserDefined": 0,
-                "MeshBar": 1,
-                "MeshCube": 2,
-                "MeshPyramid": 3,
-                "MeshCone": 4,
-                "MeshCylinder": 5,
-                "MeshBevelBar": 6,
-                "MeshBevelCube": 7,
-                "MeshSphere": 8,
-                "MeshMinimal": 9,
-                "MeshArrow": 10,
-                "MeshPoint": 11
-            }
-        }
-        Property { name: "type"; type: "SeriesType"; isReadonly: true }
-        Property { name: "itemLabelFormat"; type: "string" }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "mesh"; type: "Mesh" }
-        Property { name: "meshSmooth"; type: "bool" }
-        Property { name: "meshRotation"; type: "QQuaternion" }
-        Property { name: "userDefinedMesh"; type: "string" }
-        Property { name: "colorStyle"; type: "QtDataVisualization::Q3DTheme::ColorStyle" }
-        Property { name: "baseColor"; type: "QColor" }
-        Property { name: "baseGradient"; type: "QLinearGradient" }
-        Property { name: "singleHighlightColor"; type: "QColor" }
-        Property { name: "singleHighlightGradient"; type: "QLinearGradient" }
-        Property { name: "multiHighlightColor"; type: "QColor" }
-        Property { name: "multiHighlightGradient"; type: "QLinearGradient" }
-        Property { name: "name"; type: "string" }
-        Property { name: "itemLabel"; revision: 1; type: "string"; isReadonly: true }
-        Property { name: "itemLabelVisible"; revision: 1; type: "bool" }
-        Signal {
-            name: "itemLabelFormatChanged"
-            Parameter { name: "format"; type: "string" }
-        }
-        Signal {
-            name: "visibilityChanged"
-            Parameter { name: "visible"; type: "bool" }
-        }
-        Signal {
-            name: "meshChanged"
-            Parameter { name: "mesh"; type: "QAbstract3DSeries::Mesh" }
-        }
-        Signal {
-            name: "meshSmoothChanged"
-            Parameter { name: "enabled"; type: "bool" }
-        }
-        Signal {
-            name: "meshRotationChanged"
-            Parameter { name: "rotation"; type: "QQuaternion" }
-        }
-        Signal {
-            name: "userDefinedMeshChanged"
-            Parameter { name: "fileName"; type: "string" }
-        }
-        Signal {
-            name: "colorStyleChanged"
-            Parameter { name: "style"; type: "Q3DTheme::ColorStyle" }
-        }
-        Signal {
-            name: "baseColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "baseGradientChanged"
-            Parameter { name: "gradient"; type: "QLinearGradient" }
-        }
-        Signal {
-            name: "singleHighlightColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "singleHighlightGradientChanged"
-            Parameter { name: "gradient"; type: "QLinearGradient" }
-        }
-        Signal {
-            name: "multiHighlightColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "multiHighlightGradientChanged"
-            Parameter { name: "gradient"; type: "QLinearGradient" }
-        }
-        Signal {
-            name: "nameChanged"
-            Parameter { name: "name"; type: "string" }
-        }
-        Signal {
-            name: "itemLabelChanged"
-            revision: 1
-            Parameter { name: "label"; type: "string" }
-        }
-        Signal {
-            name: "itemLabelVisibilityChanged"
-            revision: 1
-            Parameter { name: "visible"; type: "bool" }
-        }
-        Method {
-            name: "setMeshAxisAndAngle"
-            Parameter { name: "axis"; type: "QVector3D" }
-            Parameter { name: "angle"; type: "float" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QAbstractDataProxy"
-        prototype: "QObject"
-        exports: ["QtDataVisualization/AbstractDataProxy 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Enum {
-            name: "DataType"
-            values: {
-                "DataTypeNone": 0,
-                "DataTypeBar": 1,
-                "DataTypeScatter": 2,
-                "DataTypeSurface": 4
-            }
-        }
-        Property { name: "type"; type: "DataType"; isReadonly: true }
-    }
-    Component {
-        name: "QtDataVisualization::QBar3DSeries"
-        prototype: "QtDataVisualization::QAbstract3DSeries"
-        exports: ["QtDataVisualization/QBar3DSeries 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Property { name: "dataProxy"; type: "QBarDataProxy"; isPointer: true }
-        Property { name: "selectedBar"; type: "QPoint" }
-        Property { name: "meshAngle"; type: "float" }
-        Signal {
-            name: "dataProxyChanged"
-            Parameter { name: "proxy"; type: "QBarDataProxy"; isPointer: true }
-        }
-        Signal {
-            name: "selectedBarChanged"
-            Parameter { name: "position"; type: "QPoint" }
-        }
-        Signal {
-            name: "meshAngleChanged"
-            Parameter { name: "angle"; type: "float" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QBarDataProxy"
-        prototype: "QtDataVisualization::QAbstractDataProxy"
-        exports: ["QtDataVisualization/BarDataProxy 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Property { name: "rowCount"; type: "int"; isReadonly: true }
-        Property { name: "rowLabels"; type: "QStringList" }
-        Property { name: "columnLabels"; type: "QStringList" }
-        Property { name: "series"; type: "QBar3DSeries"; isReadonly: true; isPointer: true }
-        Signal { name: "arrayReset" }
-        Signal {
-            name: "rowsAdded"
-            Parameter { name: "startIndex"; type: "int" }
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "rowsChanged"
-            Parameter { name: "startIndex"; type: "int" }
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "rowsRemoved"
-            Parameter { name: "startIndex"; type: "int" }
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "rowsInserted"
-            Parameter { name: "startIndex"; type: "int" }
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "itemChanged"
-            Parameter { name: "rowIndex"; type: "int" }
-            Parameter { name: "columnIndex"; type: "int" }
-        }
-        Signal {
-            name: "rowCountChanged"
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "seriesChanged"
-            Parameter { name: "series"; type: "QBar3DSeries"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QCategory3DAxis"
-        prototype: "QtDataVisualization::QAbstract3DAxis"
-        exports: ["QtDataVisualization/CategoryAxis3D 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "labels"; type: "QStringList" }
-    }
-    Component {
-        name: "QtDataVisualization::QCustom3DItem"
-        prototype: "QObject"
-        exports: [
-            "QtDataVisualization/Custom3DItem 1.1",
-            "QtDataVisualization/Custom3DItem 1.2"
-        ]
-        exportMetaObjectRevisions: [0, 1]
-        Property { name: "meshFile"; type: "string" }
-        Property { name: "textureFile"; type: "string" }
-        Property { name: "position"; type: "QVector3D" }
-        Property { name: "positionAbsolute"; type: "bool" }
-        Property { name: "scaling"; type: "QVector3D" }
-        Property { name: "rotation"; type: "QQuaternion" }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "shadowCasting"; type: "bool" }
-        Property { name: "scalingAbsolute"; revision: 1; type: "bool" }
-        Signal {
-            name: "meshFileChanged"
-            Parameter { name: "meshFile"; type: "string" }
-        }
-        Signal {
-            name: "textureFileChanged"
-            Parameter { name: "textureFile"; type: "string" }
-        }
-        Signal {
-            name: "positionChanged"
-            Parameter { name: "position"; type: "QVector3D" }
-        }
-        Signal {
-            name: "positionAbsoluteChanged"
-            Parameter { name: "positionAbsolute"; type: "bool" }
-        }
-        Signal {
-            name: "scalingChanged"
-            Parameter { name: "scaling"; type: "QVector3D" }
-        }
-        Signal {
-            name: "rotationChanged"
-            Parameter { name: "rotation"; type: "QQuaternion" }
-        }
-        Signal {
-            name: "visibleChanged"
-            Parameter { name: "visible"; type: "bool" }
-        }
-        Signal {
-            name: "shadowCastingChanged"
-            Parameter { name: "shadowCasting"; type: "bool" }
-        }
-        Signal {
-            name: "scalingAbsoluteChanged"
-            revision: 1
-            Parameter { name: "scalingAbsolute"; type: "bool" }
-        }
-        Method {
-            name: "setRotationAxisAndAngle"
-            Parameter { name: "axis"; type: "QVector3D" }
-            Parameter { name: "angle"; type: "float" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QCustom3DLabel"
-        prototype: "QtDataVisualization::QCustom3DItem"
-        exports: ["QtDataVisualization/Custom3DLabel 1.1"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "text"; type: "string" }
-        Property { name: "font"; type: "QFont" }
-        Property { name: "textColor"; type: "QColor" }
-        Property { name: "backgroundColor"; type: "QColor" }
-        Property { name: "borderEnabled"; type: "bool" }
-        Property { name: "backgroundEnabled"; type: "bool" }
-        Property { name: "facingCamera"; type: "bool" }
-        Signal {
-            name: "textChanged"
-            Parameter { name: "text"; type: "string" }
-        }
-        Signal {
-            name: "fontChanged"
-            Parameter { name: "font"; type: "QFont" }
-        }
-        Signal {
-            name: "textColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "backgroundColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "borderEnabledChanged"
-            Parameter { name: "enabled"; type: "bool" }
-        }
-        Signal {
-            name: "backgroundEnabledChanged"
-            Parameter { name: "enabled"; type: "bool" }
-        }
-        Signal {
-            name: "facingCameraChanged"
-            Parameter { name: "enabled"; type: "bool" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QCustom3DVolume"
-        prototype: "QtDataVisualization::QCustom3DItem"
-        exports: ["QtDataVisualization/Custom3DVolume 1.2"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "textureWidth"; type: "int" }
-        Property { name: "textureHeight"; type: "int" }
-        Property { name: "textureDepth"; type: "int" }
-        Property { name: "sliceIndexX"; type: "int" }
-        Property { name: "sliceIndexY"; type: "int" }
-        Property { name: "sliceIndexZ"; type: "int" }
-        Property { name: "colorTable"; type: "QVector<QRgb>" }
-        Property { name: "textureData"; type: "QVector<uchar>"; isPointer: true }
-        Property { name: "alphaMultiplier"; type: "float" }
-        Property { name: "preserveOpacity"; type: "bool" }
-        Property { name: "useHighDefShader"; type: "bool" }
-        Property { name: "drawSlices"; type: "bool" }
-        Property { name: "drawSliceFrames"; type: "bool" }
-        Property { name: "sliceFrameColor"; type: "QColor" }
-        Property { name: "sliceFrameWidths"; type: "QVector3D" }
-        Property { name: "sliceFrameGaps"; type: "QVector3D" }
-        Property { name: "sliceFrameThicknesses"; type: "QVector3D" }
-        Signal {
-            name: "textureWidthChanged"
-            Parameter { name: "value"; type: "int" }
-        }
-        Signal {
-            name: "textureHeightChanged"
-            Parameter { name: "value"; type: "int" }
-        }
-        Signal {
-            name: "textureDepthChanged"
-            Parameter { name: "value"; type: "int" }
-        }
-        Signal {
-            name: "sliceIndexXChanged"
-            Parameter { name: "value"; type: "int" }
-        }
-        Signal {
-            name: "sliceIndexYChanged"
-            Parameter { name: "value"; type: "int" }
-        }
-        Signal {
-            name: "sliceIndexZChanged"
-            Parameter { name: "value"; type: "int" }
-        }
-        Signal {
-            name: "textureDataChanged"
-            Parameter { name: "data"; type: "QVector<uchar>"; isPointer: true }
-        }
-        Signal {
-            name: "textureFormatChanged"
-            Parameter { name: "format"; type: "QImage::Format" }
-        }
-        Signal {
-            name: "alphaMultiplierChanged"
-            Parameter { name: "mult"; type: "float" }
-        }
-        Signal {
-            name: "preserveOpacityChanged"
-            Parameter { name: "enabled"; type: "bool" }
-        }
-        Signal {
-            name: "useHighDefShaderChanged"
-            Parameter { name: "enabled"; type: "bool" }
-        }
-        Signal {
-            name: "drawSlicesChanged"
-            Parameter { name: "enabled"; type: "bool" }
-        }
-        Signal {
-            name: "drawSliceFramesChanged"
-            Parameter { name: "enabled"; type: "bool" }
-        }
-        Signal {
-            name: "sliceFrameColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "sliceFrameWidthsChanged"
-            Parameter { name: "values"; type: "QVector3D" }
-        }
-        Signal {
-            name: "sliceFrameGapsChanged"
-            Parameter { name: "values"; type: "QVector3D" }
-        }
-        Signal {
-            name: "sliceFrameThicknessesChanged"
-            Parameter { name: "values"; type: "QVector3D" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QHeightMapSurfaceDataProxy"
-        prototype: "QtDataVisualization::QSurfaceDataProxy"
-        exports: ["QtDataVisualization/HeightMapSurfaceDataProxy 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "heightMap"; type: "QImage" }
-        Property { name: "heightMapFile"; type: "string" }
-        Property { name: "minXValue"; type: "float" }
-        Property { name: "maxXValue"; type: "float" }
-        Property { name: "minZValue"; type: "float" }
-        Property { name: "maxZValue"; type: "float" }
-        Signal {
-            name: "heightMapChanged"
-            Parameter { name: "image"; type: "QImage" }
-        }
-        Signal {
-            name: "heightMapFileChanged"
-            Parameter { name: "filename"; type: "string" }
-        }
-        Signal {
-            name: "minXValueChanged"
-            Parameter { name: "value"; type: "float" }
-        }
-        Signal {
-            name: "maxXValueChanged"
-            Parameter { name: "value"; type: "float" }
-        }
-        Signal {
-            name: "minZValueChanged"
-            Parameter { name: "value"; type: "float" }
-        }
-        Signal {
-            name: "maxZValueChanged"
-            Parameter { name: "value"; type: "float" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QItemModelBarDataProxy"
-        prototype: "QtDataVisualization::QBarDataProxy"
-        exports: [
-            "QtDataVisualization/ItemModelBarDataProxy 1.0",
-            "QtDataVisualization/ItemModelBarDataProxy 1.1"
-        ]
-        exportMetaObjectRevisions: [0, 1]
-        Enum {
-            name: "MultiMatchBehavior"
-            values: {
-                "MMBFirst": 0,
-                "MMBLast": 1,
-                "MMBAverage": 2,
-                "MMBCumulative": 3
-            }
-        }
-        Property { name: "itemModel"; type: "QAbstractItemModel"; isPointer: true }
-        Property { name: "rowRole"; type: "string" }
-        Property { name: "columnRole"; type: "string" }
-        Property { name: "valueRole"; type: "string" }
-        Property { name: "rotationRole"; type: "string" }
-        Property { name: "rowCategories"; type: "QStringList" }
-        Property { name: "columnCategories"; type: "QStringList" }
-        Property { name: "useModelCategories"; type: "bool" }
-        Property { name: "autoRowCategories"; type: "bool" }
-        Property { name: "autoColumnCategories"; type: "bool" }
-        Property { name: "rowRolePattern"; revision: 1; type: "QRegExp" }
-        Property { name: "columnRolePattern"; revision: 1; type: "QRegExp" }
-        Property { name: "valueRolePattern"; revision: 1; type: "QRegExp" }
-        Property { name: "rotationRolePattern"; revision: 1; type: "QRegExp" }
-        Property { name: "rowRoleReplace"; revision: 1; type: "string" }
-        Property { name: "columnRoleReplace"; revision: 1; type: "string" }
-        Property { name: "valueRoleReplace"; revision: 1; type: "string" }
-        Property { name: "rotationRoleReplace"; revision: 1; type: "string" }
-        Property { name: "multiMatchBehavior"; revision: 1; type: "MultiMatchBehavior" }
-        Signal {
-            name: "itemModelChanged"
-            Parameter { name: "itemModel"; type: "const QAbstractItemModel"; isPointer: true }
-        }
-        Signal {
-            name: "rowRoleChanged"
-            Parameter { name: "role"; type: "string" }
-        }
-        Signal {
-            name: "columnRoleChanged"
-            Parameter { name: "role"; type: "string" }
-        }
-        Signal {
-            name: "valueRoleChanged"
-            Parameter { name: "role"; type: "string" }
-        }
-        Signal {
-            name: "rotationRoleChanged"
-            Parameter { name: "role"; type: "string" }
-        }
-        Signal {
-            name: "useModelCategoriesChanged"
-            Parameter { name: "enable"; type: "bool" }
-        }
-        Signal {
-            name: "autoRowCategoriesChanged"
-            Parameter { name: "enable"; type: "bool" }
-        }
-        Signal {
-            name: "autoColumnCategoriesChanged"
-            Parameter { name: "enable"; type: "bool" }
-        }
-        Signal {
-            name: "rowRolePatternChanged"
-            revision: 1
-            Parameter { name: "pattern"; type: "QRegExp" }
-        }
-        Signal {
-            name: "columnRolePatternChanged"
-            revision: 1
-            Parameter { name: "pattern"; type: "QRegExp" }
-        }
-        Signal {
-            name: "valueRolePatternChanged"
-            revision: 1
-            Parameter { name: "pattern"; type: "QRegExp" }
-        }
-        Signal {
-            name: "rotationRolePatternChanged"
-            revision: 1
-            Parameter { name: "pattern"; type: "QRegExp" }
-        }
-        Signal {
-            name: "rowRoleReplaceChanged"
-            revision: 1
-            Parameter { name: "replace"; type: "string" }
-        }
-        Signal {
-            name: "columnRoleReplaceChanged"
-            revision: 1
-            Parameter { name: "replace"; type: "string" }
-        }
-        Signal {
-            name: "valueRoleReplaceChanged"
-            revision: 1
-            Parameter { name: "replace"; type: "string" }
-        }
-        Signal {
-            name: "rotationRoleReplaceChanged"
-            revision: 1
-            Parameter { name: "replace"; type: "string" }
-        }
-        Signal {
-            name: "multiMatchBehaviorChanged"
-            revision: 1
-            Parameter { name: "behavior"; type: "MultiMatchBehavior" }
-        }
-        Method {
-            name: "rowCategoryIndex"
-            type: "int"
-            Parameter { name: "category"; type: "string" }
-        }
-        Method {
-            name: "columnCategoryIndex"
-            type: "int"
-            Parameter { name: "category"; type: "string" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QItemModelScatterDataProxy"
-        prototype: "QtDataVisualization::QScatterDataProxy"
-        exports: [
-            "QtDataVisualization/ItemModelScatterDataProxy 1.0",
-            "QtDataVisualization/ItemModelScatterDataProxy 1.1"
-        ]
-        exportMetaObjectRevisions: [0, 1]
-        Property { name: "itemModel"; type: "QAbstractItemModel"; isPointer: true }
-        Property { name: "xPosRole"; type: "string" }
-        Property { name: "yPosRole"; type: "string" }
-        Property { name: "zPosRole"; type: "string" }
-        Property { name: "rotationRole"; type: "string" }
-        Property { name: "xPosRolePattern"; revision: 1; type: "QRegExp" }
-        Property { name: "yPosRolePattern"; revision: 1; type: "QRegExp" }
-        Property { name: "zPosRolePattern"; revision: 1; type: "QRegExp" }
-        Property { name: "rotationRolePattern"; revision: 1; type: "QRegExp" }
-        Property { name: "xPosRoleReplace"; revision: 1; type: "string" }
-        Property { name: "yPosRoleReplace"; revision: 1; type: "string" }
-        Property { name: "zPosRoleReplace"; revision: 1; type: "string" }
-        Property { name: "rotationRoleReplace"; revision: 1; type: "string" }
-        Signal {
-            name: "itemModelChanged"
-            Parameter { name: "itemModel"; type: "const QAbstractItemModel"; isPointer: true }
-        }
-        Signal {
-            name: "xPosRoleChanged"
-            Parameter { name: "role"; type: "string" }
-        }
-        Signal {
-            name: "yPosRoleChanged"
-            Parameter { name: "role"; type: "string" }
-        }
-        Signal {
-            name: "zPosRoleChanged"
-            Parameter { name: "role"; type: "string" }
-        }
-        Signal {
-            name: "rotationRoleChanged"
-            Parameter { name: "role"; type: "string" }
-        }
-        Signal {
-            name: "xPosRolePatternChanged"
-            revision: 1
-            Parameter { name: "pattern"; type: "QRegExp" }
-        }
-        Signal {
-            name: "yPosRolePatternChanged"
-            revision: 1
-            Parameter { name: "pattern"; type: "QRegExp" }
-        }
-        Signal {
-            name: "zPosRolePatternChanged"
-            revision: 1
-            Parameter { name: "pattern"; type: "QRegExp" }
-        }
-        Signal {
-            name: "rotationRolePatternChanged"
-            revision: 1
-            Parameter { name: "pattern"; type: "QRegExp" }
-        }
-        Signal {
-            name: "rotationRoleReplaceChanged"
-            revision: 1
-            Parameter { name: "replace"; type: "string" }
-        }
-        Signal {
-            name: "xPosRoleReplaceChanged"
-            revision: 1
-            Parameter { name: "replace"; type: "string" }
-        }
-        Signal {
-            name: "yPosRoleReplaceChanged"
-            revision: 1
-            Parameter { name: "replace"; type: "string" }
-        }
-        Signal {
-            name: "zPosRoleReplaceChanged"
-            revision: 1
-            Parameter { name: "replace"; type: "string" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QItemModelSurfaceDataProxy"
-        prototype: "QtDataVisualization::QSurfaceDataProxy"
-        exports: [
-            "QtDataVisualization/ItemModelSurfaceDataProxy 1.0",
-            "QtDataVisualization/ItemModelSurfaceDataProxy 1.1"
-        ]
-        exportMetaObjectRevisions: [0, 1]
-        Enum {
-            name: "MultiMatchBehavior"
-            values: {
-                "MMBFirst": 0,
-                "MMBLast": 1,
-                "MMBAverage": 2,
-                "MMBCumulativeY": 3
-            }
-        }
-        Property { name: "itemModel"; type: "QAbstractItemModel"; isPointer: true }
-        Property { name: "rowRole"; type: "string" }
-        Property { name: "columnRole"; type: "string" }
-        Property { name: "xPosRole"; type: "string" }
-        Property { name: "yPosRole"; type: "string" }
-        Property { name: "zPosRole"; type: "string" }
-        Property { name: "rowCategories"; type: "QStringList" }
-        Property { name: "columnCategories"; type: "QStringList" }
-        Property { name: "useModelCategories"; type: "bool" }
-        Property { name: "autoRowCategories"; type: "bool" }
-        Property { name: "autoColumnCategories"; type: "bool" }
-        Property { name: "rowRolePattern"; revision: 1; type: "QRegExp" }
-        Property { name: "columnRolePattern"; revision: 1; type: "QRegExp" }
-        Property { name: "xPosRolePattern"; revision: 1; type: "QRegExp" }
-        Property { name: "yPosRolePattern"; revision: 1; type: "QRegExp" }
-        Property { name: "zPosRolePattern"; revision: 1; type: "QRegExp" }
-        Property { name: "rowRoleReplace"; revision: 1; type: "string" }
-        Property { name: "columnRoleReplace"; revision: 1; type: "string" }
-        Property { name: "xPosRoleReplace"; revision: 1; type: "string" }
-        Property { name: "yPosRoleReplace"; revision: 1; type: "string" }
-        Property { name: "zPosRoleReplace"; revision: 1; type: "string" }
-        Property { name: "multiMatchBehavior"; revision: 1; type: "MultiMatchBehavior" }
-        Signal {
-            name: "itemModelChanged"
-            Parameter { name: "itemModel"; type: "const QAbstractItemModel"; isPointer: true }
-        }
-        Signal {
-            name: "rowRoleChanged"
-            Parameter { name: "role"; type: "string" }
-        }
-        Signal {
-            name: "columnRoleChanged"
-            Parameter { name: "role"; type: "string" }
-        }
-        Signal {
-            name: "xPosRoleChanged"
-            Parameter { name: "role"; type: "string" }
-        }
-        Signal {
-            name: "yPosRoleChanged"
-            Parameter { name: "role"; type: "string" }
-        }
-        Signal {
-            name: "zPosRoleChanged"
-            Parameter { name: "role"; type: "string" }
-        }
-        Signal {
-            name: "useModelCategoriesChanged"
-            Parameter { name: "enable"; type: "bool" }
-        }
-        Signal {
-            name: "autoRowCategoriesChanged"
-            Parameter { name: "enable"; type: "bool" }
-        }
-        Signal {
-            name: "autoColumnCategoriesChanged"
-            Parameter { name: "enable"; type: "bool" }
-        }
-        Signal {
-            name: "rowRolePatternChanged"
-            revision: 1
-            Parameter { name: "pattern"; type: "QRegExp" }
-        }
-        Signal {
-            name: "columnRolePatternChanged"
-            revision: 1
-            Parameter { name: "pattern"; type: "QRegExp" }
-        }
-        Signal {
-            name: "xPosRolePatternChanged"
-            revision: 1
-            Parameter { name: "pattern"; type: "QRegExp" }
-        }
-        Signal {
-            name: "yPosRolePatternChanged"
-            revision: 1
-            Parameter { name: "pattern"; type: "QRegExp" }
-        }
-        Signal {
-            name: "zPosRolePatternChanged"
-            revision: 1
-            Parameter { name: "pattern"; type: "QRegExp" }
-        }
-        Signal {
-            name: "rowRoleReplaceChanged"
-            revision: 1
-            Parameter { name: "replace"; type: "string" }
-        }
-        Signal {
-            name: "columnRoleReplaceChanged"
-            revision: 1
-            Parameter { name: "replace"; type: "string" }
-        }
-        Signal {
-            name: "xPosRoleReplaceChanged"
-            revision: 1
-            Parameter { name: "replace"; type: "string" }
-        }
-        Signal {
-            name: "yPosRoleReplaceChanged"
-            revision: 1
-            Parameter { name: "replace"; type: "string" }
-        }
-        Signal {
-            name: "zPosRoleReplaceChanged"
-            revision: 1
-            Parameter { name: "replace"; type: "string" }
-        }
-        Signal {
-            name: "multiMatchBehaviorChanged"
-            revision: 1
-            Parameter { name: "behavior"; type: "MultiMatchBehavior" }
-        }
-        Method {
-            name: "rowCategoryIndex"
-            type: "int"
-            Parameter { name: "category"; type: "string" }
-        }
-        Method {
-            name: "columnCategoryIndex"
-            type: "int"
-            Parameter { name: "category"; type: "string" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QLogValue3DAxisFormatter"
-        prototype: "QtDataVisualization::QValue3DAxisFormatter"
-        exports: ["QtDataVisualization/LogValueAxis3DFormatter 1.1"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "base"; type: "double" }
-        Property { name: "autoSubGrid"; type: "bool" }
-        Property { name: "showEdgeLabels"; type: "bool" }
-        Signal {
-            name: "baseChanged"
-            Parameter { name: "base"; type: "double" }
-        }
-        Signal {
-            name: "autoSubGridChanged"
-            Parameter { name: "enabled"; type: "bool" }
-        }
-        Signal {
-            name: "showEdgeLabelsChanged"
-            Parameter { name: "enabled"; type: "bool" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QScatter3DSeries"
-        prototype: "QtDataVisualization::QAbstract3DSeries"
-        exports: ["QtDataVisualization/QScatter3DSeries 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Property { name: "dataProxy"; type: "QScatterDataProxy"; isPointer: true }
-        Property { name: "selectedItem"; type: "int" }
-        Property { name: "itemSize"; type: "float" }
-        Signal {
-            name: "dataProxyChanged"
-            Parameter { name: "proxy"; type: "QScatterDataProxy"; isPointer: true }
-        }
-        Signal {
-            name: "selectedItemChanged"
-            Parameter { name: "index"; type: "int" }
-        }
-        Signal {
-            name: "itemSizeChanged"
-            Parameter { name: "size"; type: "float" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QScatterDataProxy"
-        prototype: "QtDataVisualization::QAbstractDataProxy"
-        exports: ["QtDataVisualization/ScatterDataProxy 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Property { name: "itemCount"; type: "int"; isReadonly: true }
-        Property { name: "series"; type: "QScatter3DSeries"; isReadonly: true; isPointer: true }
-        Signal { name: "arrayReset" }
-        Signal {
-            name: "itemsAdded"
-            Parameter { name: "startIndex"; type: "int" }
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "itemsChanged"
-            Parameter { name: "startIndex"; type: "int" }
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "itemsRemoved"
-            Parameter { name: "startIndex"; type: "int" }
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "itemsInserted"
-            Parameter { name: "startIndex"; type: "int" }
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "itemCountChanged"
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "seriesChanged"
-            Parameter { name: "series"; type: "QScatter3DSeries"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QSurface3DSeries"
-        prototype: "QtDataVisualization::QAbstract3DSeries"
-        exports: ["QtDataVisualization/QSurface3DSeries 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Enum {
-            name: "DrawFlag"
-            values: {
-                "DrawWireframe": 1,
-                "DrawSurface": 2,
-                "DrawSurfaceAndWireframe": 3
-            }
-        }
-        Enum {
-            name: "DrawFlags"
-            values: {
-                "DrawWireframe": 1,
-                "DrawSurface": 2,
-                "DrawSurfaceAndWireframe": 3
-            }
-        }
-        Property { name: "dataProxy"; type: "QSurfaceDataProxy"; isPointer: true }
-        Property { name: "selectedPoint"; type: "QPoint" }
-        Property { name: "flatShadingEnabled"; type: "bool" }
-        Property { name: "flatShadingSupported"; type: "bool"; isReadonly: true }
-        Property { name: "drawMode"; type: "DrawFlags" }
-        Property { name: "texture"; type: "QImage" }
-        Property { name: "textureFile"; type: "string" }
-        Signal {
-            name: "dataProxyChanged"
-            Parameter { name: "proxy"; type: "QSurfaceDataProxy"; isPointer: true }
-        }
-        Signal {
-            name: "selectedPointChanged"
-            Parameter { name: "position"; type: "QPoint" }
-        }
-        Signal {
-            name: "flatShadingEnabledChanged"
-            Parameter { name: "enable"; type: "bool" }
-        }
-        Signal {
-            name: "flatShadingSupportedChanged"
-            Parameter { name: "enable"; type: "bool" }
-        }
-        Signal {
-            name: "drawModeChanged"
-            Parameter { name: "mode"; type: "QSurface3DSeries::DrawFlags" }
-        }
-        Signal {
-            name: "textureChanged"
-            Parameter { name: "image"; type: "QImage" }
-        }
-        Signal {
-            name: "textureFileChanged"
-            Parameter { name: "filename"; type: "string" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QSurfaceDataProxy"
-        prototype: "QtDataVisualization::QAbstractDataProxy"
-        exports: ["QtDataVisualization/SurfaceDataProxy 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Property { name: "rowCount"; type: "int"; isReadonly: true }
-        Property { name: "columnCount"; type: "int"; isReadonly: true }
-        Property { name: "series"; type: "QSurface3DSeries"; isReadonly: true; isPointer: true }
-        Signal { name: "arrayReset" }
-        Signal {
-            name: "rowsAdded"
-            Parameter { name: "startIndex"; type: "int" }
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "rowsChanged"
-            Parameter { name: "startIndex"; type: "int" }
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "rowsRemoved"
-            Parameter { name: "startIndex"; type: "int" }
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "rowsInserted"
-            Parameter { name: "startIndex"; type: "int" }
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "itemChanged"
-            Parameter { name: "rowIndex"; type: "int" }
-            Parameter { name: "columnIndex"; type: "int" }
-        }
-        Signal {
-            name: "rowCountChanged"
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "columnCountChanged"
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "seriesChanged"
-            Parameter { name: "series"; type: "QSurface3DSeries"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QTouch3DInputHandler"
-        prototype: "QtDataVisualization::Q3DInputHandler"
-        exports: ["QtDataVisualization/TouchInputHandler3D 1.2"]
-        exportMetaObjectRevisions: [0]
-    }
-    Component {
-        name: "QtDataVisualization::QValue3DAxis"
-        prototype: "QtDataVisualization::QAbstract3DAxis"
-        exports: [
-            "QtDataVisualization/ValueAxis3D 1.0",
-            "QtDataVisualization/ValueAxis3D 1.1"
-        ]
-        exportMetaObjectRevisions: [0, 1]
-        Property { name: "segmentCount"; type: "int" }
-        Property { name: "subSegmentCount"; type: "int" }
-        Property { name: "labelFormat"; type: "string" }
-        Property { name: "formatter"; revision: 1; type: "QValue3DAxisFormatter"; isPointer: true }
-        Property { name: "reversed"; revision: 1; type: "bool" }
-        Signal {
-            name: "segmentCountChanged"
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "subSegmentCountChanged"
-            Parameter { name: "count"; type: "int" }
-        }
-        Signal {
-            name: "labelFormatChanged"
-            Parameter { name: "format"; type: "string" }
-        }
-        Signal {
-            name: "formatterChanged"
-            revision: 1
-            Parameter { name: "formatter"; type: "QValue3DAxisFormatter"; isPointer: true }
-        }
-        Signal {
-            name: "reversedChanged"
-            revision: 1
-            Parameter { name: "enable"; type: "bool" }
-        }
-    }
-    Component {
-        name: "QtDataVisualization::QValue3DAxisFormatter"
-        prototype: "QObject"
-        exports: ["QtDataVisualization/ValueAxis3DFormatter 1.1"]
-        exportMetaObjectRevisions: [0]
-    }
-}