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>

20 files changed, 103 insertions, 101 deletions

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