Remove the qml revisioning for 1.x

The revision version from Qt5 aren't really usable and is causing
problems for new classes extending a base class with 1.x revisions,
which means properties won't be exposes properly without some extra
steps. Since this is not giving us something besides extra cruft,
we might as well just remove the old revisions.

Pick-to: 6.2
Change-Id: Icb1a4d48e6d8503bc64b4ff5a2e2174c53f0164e
Reviewed-by: Andy Nichols <[email protected]>

31 files changed, 47 insertions, 146 deletions

diff --git a/src/helpers/gridgeometry_p.h b/src/helpers/gridgeometry_p.h
index 356d6552..560d833b 100644
--- a/src/helpers/gridgeometry_p.h
+++ b/src/helpers/gridgeometry_p.h
@@ -56,7 +56,6 @@ class GridGeometry : public QQuick3DGeometry
     Q_PROPERTY(float horizontalStep READ horizontalStep WRITE setHorizontalStep NOTIFY horizontalStepChanged)
     Q_PROPERTY(float verticalStep READ verticalStep WRITE setVerticalStep NOTIFY verticalStepChanged)
     QML_NAMED_ELEMENT(GridGeometry)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     GridGeometry();
diff --git a/src/quick3d/qquick3dabstractlight_p.h b/src/quick3d/qquick3dabstractlight_p.h
index e8bcd6a2..87102904 100644
--- a/src/quick3d/qquick3dabstractlight_p.h
+++ b/src/quick3d/qquick3dabstractlight_p.h
@@ -63,7 +63,6 @@ class Q_QUICK3D_EXPORT QQuick3DAbstractLight : public QQuick3DNode
 
     QML_NAMED_ELEMENT(Light)
     QML_UNCREATABLE("Light is Abstract")
-    QML_ADDED_IN_VERSION(1, 14)
 public:
     ~QQuick3DAbstractLight() override;
 
diff --git a/src/quick3d/qquick3dcamera_p.h b/src/quick3d/qquick3dcamera_p.h
index 6c6bdf49..f103b825 100644
--- a/src/quick3d/qquick3dcamera_p.h
+++ b/src/quick3d/qquick3dcamera_p.h
@@ -52,7 +52,6 @@ class Q_QUICK3D_EXPORT QQuick3DCamera : public QQuick3DNode
     Q_PROPERTY(bool frustumCullingEnabled READ frustumCullingEnabled WRITE setFrustumCullingEnabled NOTIFY frustumCullingEnabledChanged)
     QML_NAMED_ELEMENT(Camera)
     QML_UNCREATABLE("Camera is Abstract")
-    QML_ADDED_IN_VERSION(1, 14)
 public:
     Q_INVOKABLE QVector3D mapToViewport(const QVector3D &scenePos) const;
     Q_INVOKABLE QVector3D mapFromViewport(const QVector3D &viewportPos) const;
@@ -63,8 +62,8 @@ public:
                               qreal width,
                               qreal height);
 
-    Q_REVISION(1, 1) Q_INVOKABLE void lookAt(const QVector3D &scenePos);
-    Q_REVISION(1, 1) Q_INVOKABLE void lookAt(QQuick3DNode *node);
+    Q_INVOKABLE void lookAt(const QVector3D &scenePos);
+    Q_INVOKABLE void lookAt(QQuick3DNode *node);
 
     QSSGRenderCamera *cameraNode() const;
     void setCameraNode(QSSGRenderCamera *camera) { m_cameraNode = camera; }
diff --git a/src/quick3d/qquick3dcustomcamera_p.h b/src/quick3d/qquick3dcustomcamera_p.h
index 13d91200..47d6cc64 100644
--- a/src/quick3d/qquick3dcustomcamera_p.h
+++ b/src/quick3d/qquick3dcustomcamera_p.h
@@ -52,7 +52,6 @@ class Q_QUICK3D_EXPORT QQuick3DCustomCamera : public QQuick3DCamera
     Q_PROPERTY(QMatrix4x4 projection READ projection WRITE setProjection NOTIFY projectionChanged)
 
     QML_NAMED_ELEMENT(CustomCamera)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     explicit QQuick3DCustomCamera(QQuick3DNode *parent = nullptr);
diff --git a/src/quick3d/qquick3dcustommaterial_p.h b/src/quick3d/qquick3dcustommaterial_p.h
index 52be0643..ca9df34d 100644
--- a/src/quick3d/qquick3dcustommaterial_p.h
+++ b/src/quick3d/qquick3dcustommaterial_p.h
@@ -62,7 +62,6 @@ class Q_QUICK3D_EXPORT QQuick3DCustomMaterial : public QQuick3DMaterial
     Q_PROPERTY(float lineWidth READ lineWidth WRITE setLineWidth NOTIFY lineWidthChanged)
 
     QML_NAMED_ELEMENT(CustomMaterial)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     enum class ShadingMode
diff --git a/src/quick3d/qquick3ddefaultmaterial_p.h b/src/quick3d/qquick3ddefaultmaterial_p.h
index 166bc9a3..384013cb 100644
--- a/src/quick3d/qquick3ddefaultmaterial_p.h
+++ b/src/quick3d/qquick3ddefaultmaterial_p.h
@@ -71,11 +71,11 @@ class Q_QUICK3D_EXPORT QQuick3DDefaultMaterial : public QQuick3DMaterial
     Q_PROPERTY(float specularAmount READ specularAmount WRITE setSpecularAmount NOTIFY specularAmountChanged)
     Q_PROPERTY(float specularRoughness READ specularRoughness WRITE setSpecularRoughness NOTIFY specularRoughnessChanged)
     Q_PROPERTY(QQuick3DTexture *roughnessMap READ roughnessMap WRITE setRoughnessMap NOTIFY roughnessMapChanged)
-    Q_PROPERTY(TextureChannelMapping roughnessChannel READ roughnessChannel WRITE setRoughnessChannel NOTIFY roughnessChannelChanged REVISION(1, 1))
+    Q_PROPERTY(TextureChannelMapping roughnessChannel READ roughnessChannel WRITE setRoughnessChannel NOTIFY roughnessChannelChanged)
 
     Q_PROPERTY(float opacity READ opacity WRITE setOpacity NOTIFY opacityChanged)
     Q_PROPERTY(QQuick3DTexture *opacityMap READ opacityMap WRITE setOpacityMap NOTIFY opacityMapChanged)
-    Q_PROPERTY(TextureChannelMapping opacityChannel READ opacityChannel WRITE setOpacityChannel NOTIFY opacityChannelChanged REVISION(1, 1))
+    Q_PROPERTY(TextureChannelMapping opacityChannel READ opacityChannel WRITE setOpacityChannel NOTIFY opacityChannelChanged)
 
     Q_PROPERTY(QQuick3DTexture *bumpMap READ bumpMap WRITE setBumpMap NOTIFY bumpMapChanged)
     Q_PROPERTY(float bumpAmount READ bumpAmount WRITE setBumpAmount NOTIFY bumpAmountChanged)
@@ -83,7 +83,7 @@ class Q_QUICK3D_EXPORT QQuick3DDefaultMaterial : public QQuick3DMaterial
     Q_PROPERTY(QQuick3DTexture *normalMap READ normalMap WRITE setNormalMap NOTIFY normalMapChanged)
 
     Q_PROPERTY(QQuick3DTexture *translucencyMap READ translucencyMap WRITE setTranslucencyMap NOTIFY translucencyMapChanged)
-    Q_PROPERTY(TextureChannelMapping translucencyChannel READ translucencyChannel WRITE setTranslucencyChannel NOTIFY translucencyChannelChanged REVISION(1, 1))
+    Q_PROPERTY(TextureChannelMapping translucencyChannel READ translucencyChannel WRITE setTranslucencyChannel NOTIFY translucencyChannelChanged)
     Q_PROPERTY(float translucentFalloff READ translucentFalloff WRITE setTranslucentFalloff NOTIFY translucentFalloffChanged)
 
     Q_PROPERTY(float diffuseLightWrap READ diffuseLightWrap WRITE setDiffuseLightWrap NOTIFY diffuseLightWrapChanged)
@@ -94,7 +94,6 @@ class Q_QUICK3D_EXPORT QQuick3DDefaultMaterial : public QQuick3DMaterial
     Q_PROPERTY(float lineWidth READ lineWidth WRITE setLineWidth NOTIFY lineWidthChanged)
 
     QML_NAMED_ELEMENT(DefaultMaterial)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     enum Lighting { NoLighting = 0, FragmentLighting };
@@ -134,9 +133,9 @@ public:
     float translucentFalloff() const;
     float diffuseLightWrap() const;
     bool vertexColorsEnabled() const;
-    Q_REVISION(1, 1) TextureChannelMapping roughnessChannel() const;
-    Q_REVISION(1, 1) TextureChannelMapping opacityChannel() const;
-    Q_REVISION(1, 1) TextureChannelMapping translucencyChannel() const;
+    TextureChannelMapping roughnessChannel() const;
+    TextureChannelMapping opacityChannel() const;
+    TextureChannelMapping translucencyChannel() const;
 
     float pointSize() const;
     float lineWidth() const;
@@ -170,9 +169,9 @@ public Q_SLOTS:
     void setDiffuseLightWrap(float diffuseLightWrap);
     void setVertexColorsEnabled(bool vertexColorsEnabled);
 
-    Q_REVISION(1, 1) void setRoughnessChannel(QQuick3DMaterial::TextureChannelMapping channel);
-    Q_REVISION(1, 1) void setOpacityChannel(QQuick3DMaterial::TextureChannelMapping channel);
-    Q_REVISION(1, 1) void setTranslucencyChannel(QQuick3DMaterial::TextureChannelMapping channel);
+    void setRoughnessChannel(QQuick3DMaterial::TextureChannelMapping channel);
+    void setOpacityChannel(QQuick3DMaterial::TextureChannelMapping channel);
+    void setTranslucencyChannel(QQuick3DMaterial::TextureChannelMapping channel);
 
     void setPointSize(float size);
     void setLineWidth(float width);
@@ -202,9 +201,9 @@ Q_SIGNALS:
     void translucentFalloffChanged(float translucentFalloff);
     void diffuseLightWrapChanged(float diffuseLightWrap);
     void vertexColorsEnabledChanged(bool vertexColorsEnabled);
-    Q_REVISION(1, 1) void roughnessChannelChanged(QQuick3DMaterial::TextureChannelMapping channel);
-    Q_REVISION(1, 1) void opacityChannelChanged(QQuick3DMaterial::TextureChannelMapping channel);
-    Q_REVISION(1, 1) void translucencyChannelChanged(QQuick3DMaterial::TextureChannelMapping channel);
+    void roughnessChannelChanged(QQuick3DMaterial::TextureChannelMapping channel);
+    void opacityChannelChanged(QQuick3DMaterial::TextureChannelMapping channel);
+    void translucencyChannelChanged(QQuick3DMaterial::TextureChannelMapping channel);
     void pointSizeChanged();
     void lineWidthChanged();
 
diff --git a/src/quick3d/qquick3ddirectionallight_p.h b/src/quick3d/qquick3ddirectionallight_p.h
index 2b6b59f4..6c474bee 100644
--- a/src/quick3d/qquick3ddirectionallight_p.h
+++ b/src/quick3d/qquick3ddirectionallight_p.h
@@ -52,7 +52,6 @@ class Q_QUICK3D_EXPORT QQuick3DDirectionalLight : public QQuick3DAbstractLight
     Q_OBJECT
 
     QML_NAMED_ELEMENT(DirectionalLight)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     explicit QQuick3DDirectionalLight(QQuick3DNode *parent = nullptr);
diff --git a/src/quick3d/qquick3deffect_p.h b/src/quick3d/qquick3deffect_p.h
index 0915d6cd..44f12dce 100644
--- a/src/quick3d/qquick3deffect_p.h
+++ b/src/quick3d/qquick3deffect_p.h
@@ -61,7 +61,6 @@ class Q_QUICK3D_EXPORT QQuick3DEffect : public QQuick3DObject
     Q_PROPERTY(QQmlListProperty<QQuick3DShaderUtilsRenderPass> passes READ passes)
 
     QML_NAMED_ELEMENT(Effect)
-    QML_ADDED_IN_VERSION(1, 15)
 public:
     explicit QQuick3DEffect(QQuick3DObject *parent = nullptr);
 
diff --git a/src/quick3d/qquick3dfrustumcamera_p.h b/src/quick3d/qquick3dfrustumcamera_p.h
index 1219a498..cdd564af 100644
--- a/src/quick3d/qquick3dfrustumcamera_p.h
+++ b/src/quick3d/qquick3dfrustumcamera_p.h
@@ -55,7 +55,6 @@ class Q_QUICK3D_EXPORT QQuick3DFrustumCamera : public QQuick3DPerspectiveCamera
     Q_PROPERTY(float left READ right WRITE setLeft NOTIFY leftChanged)
 
     QML_NAMED_ELEMENT(FrustumCamera)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     QQuick3DFrustumCamera();
diff --git a/src/quick3d/qquick3dgeometry.h b/src/quick3d/qquick3dgeometry.h
index fba9de0f..17ed34c4 100644
--- a/src/quick3d/qquick3dgeometry.h
+++ b/src/quick3d/qquick3dgeometry.h
@@ -43,7 +43,6 @@ class Q_QUICK3D_EXPORT QQuick3DGeometry : public QQuick3DObject
 
     QML_NAMED_ELEMENT(Geometry)
     QML_UNCREATABLE("Geometry is Abstract")
-    QML_ADDED_IN_VERSION(1, 14)
 public:
     explicit QQuick3DGeometry(QQuick3DObject *parent = nullptr);
     ~QQuick3DGeometry() override;
diff --git a/src/quick3d/qquick3djoint_p.h b/src/quick3d/qquick3djoint_p.h
index 6340f2cb..cba67304 100644
--- a/src/quick3d/qquick3djoint_p.h
+++ b/src/quick3d/qquick3djoint_p.h
@@ -55,7 +55,6 @@ class Q_QUICK3D_EXPORT QQuick3DJoint : public QQuick3DNode
     Q_PROPERTY(QQuick3DSkeleton *skeletonRoot READ skeletonRoot WRITE setSkeletonRoot NOTIFY skeletonRootChanged)
 
     QML_NAMED_ELEMENT(Joint)
-    QML_ADDED_IN_VERSION(1, 15)
 
 public:
     explicit QQuick3DJoint(QQuick3DNode *parent = nullptr);
diff --git a/src/quick3d/qquick3dloader_p.h b/src/quick3d/qquick3dloader_p.h
index d9fea9ae..3bef09ce 100644
--- a/src/quick3d/qquick3dloader_p.h
+++ b/src/quick3d/qquick3dloader_p.h
@@ -78,7 +78,6 @@ class Q_QUICK3D_EXPORT QQuick3DLoader : public QQuick3DNode
     Q_PROPERTY(bool asynchronous READ asynchronous WRITE setAsynchronous NOTIFY asynchronousChanged)
 
     QML_NAMED_ELEMENT(Loader3D)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     explicit QQuick3DLoader(QQuick3DNode *parent = nullptr);
diff --git a/src/quick3d/qquick3dmaterial_p.h b/src/quick3d/qquick3dmaterial_p.h
index 8fcfd77a..9bf74826 100644
--- a/src/quick3d/qquick3dmaterial_p.h
+++ b/src/quick3d/qquick3dmaterial_p.h
@@ -58,7 +58,6 @@ class Q_QUICK3D_EXPORT QQuick3DMaterial : public QQuick3DObject
 
     QML_NAMED_ELEMENT(Material)
     QML_UNCREATABLE("Material is Abstract")
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     enum CullMode {
diff --git a/src/quick3d/qquick3dmodel_p.h b/src/quick3d/qquick3dmodel_p.h
index 4e502377..cc65f695 100644
--- a/src/quick3d/qquick3dmodel_p.h
+++ b/src/quick3d/qquick3dmodel_p.h
@@ -94,11 +94,10 @@ class Q_QUICK3D_EXPORT QQuick3DModel : public QQuick3DNode
     Q_PROPERTY(QQuick3DNode *instanceRoot READ instanceRoot WRITE setInstanceRoot NOTIFY instanceRootChanged)
     Q_PROPERTY(QQuick3DSkeleton *skeleton READ skeleton WRITE setSkeleton NOTIFY skeletonChanged)
     Q_PROPERTY(QList<QMatrix4x4> inverseBindPoses READ inverseBindPoses WRITE setInverseBindPoses NOTIFY inverseBindPosesChanged)
-    Q_PROPERTY(QQuick3DBounds3 bounds READ bounds NOTIFY boundsChanged REVISION(1, 1))
+    Q_PROPERTY(QQuick3DBounds3 bounds READ bounds NOTIFY boundsChanged)
     Q_PROPERTY(float depthBias READ depthBias WRITE setDepthBias NOTIFY depthBiasChanged)
 
     QML_NAMED_ELEMENT(Model)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     explicit QQuick3DModel(QQuick3DNode *parent = nullptr);
diff --git a/src/quick3d/qquick3dnode_p.h b/src/quick3d/qquick3dnode_p.h
index 84b126a3..0ee6d020 100644
--- a/src/quick3d/qquick3dnode_p.h
+++ b/src/quick3d/qquick3dnode_p.h
@@ -58,8 +58,8 @@ class Q_QUICK3D_EXPORT QQuick3DNode : public QQuick3DObject
     Q_PROPERTY(float x READ x WRITE setX NOTIFY xChanged)
     Q_PROPERTY(float y READ y WRITE setY NOTIFY yChanged)
     Q_PROPERTY(float z READ z WRITE setZ NOTIFY zChanged)
-    Q_PROPERTY(QQuaternion rotation READ rotation WRITE setRotation NOTIFY rotationChanged REVISION(1, 1))
-    Q_PROPERTY(QVector3D eulerRotation READ eulerRotation WRITE setEulerRotation NOTIFY eulerRotationChanged REVISION(1, 1))
+    Q_PROPERTY(QQuaternion rotation READ rotation WRITE setRotation NOTIFY rotationChanged)
+    Q_PROPERTY(QVector3D eulerRotation READ eulerRotation WRITE setEulerRotation NOTIFY eulerRotationChanged)
     Q_PROPERTY(QVector3D position READ position WRITE setPosition NOTIFY positionChanged)
     Q_PROPERTY(QVector3D scale READ scale WRITE setScale NOTIFY scaleChanged)
     Q_PROPERTY(QVector3D pivot READ pivot WRITE setPivot NOTIFY pivotChanged)
@@ -69,13 +69,12 @@ class Q_QUICK3D_EXPORT QQuick3DNode : public QQuick3DObject
     Q_PROPERTY(QVector3D up READ up)
     Q_PROPERTY(QVector3D right READ right)
     Q_PROPERTY(QVector3D scenePosition READ scenePosition NOTIFY scenePositionChanged)
-    Q_PROPERTY(QQuaternion sceneRotation READ sceneRotation NOTIFY sceneRotationChanged REVISION(1, 1))
+    Q_PROPERTY(QQuaternion sceneRotation READ sceneRotation NOTIFY sceneRotationChanged)
     Q_PROPERTY(QVector3D sceneScale READ sceneScale NOTIFY sceneScaleChanged)
     Q_PROPERTY(QMatrix4x4 sceneTransform READ sceneTransform NOTIFY sceneTransformChanged)
-    Q_PROPERTY(int staticFlags READ staticFlags WRITE setStaticFlags NOTIFY staticFlagsChanged REVISION(1, 1))
+    Q_PROPERTY(int staticFlags READ staticFlags WRITE setStaticFlags NOTIFY staticFlagsChanged)
 
     QML_NAMED_ELEMENT(Node)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     enum TransformSpace {
@@ -96,8 +95,8 @@ public:
     float x() const;
     float y() const;
     float z() const;
-    Q_REVISION(1, 1) QQuaternion rotation() const;
-    Q_REVISION(1, 1) QVector3D eulerRotation() const;
+    QQuaternion rotation() const;
+    QVector3D eulerRotation() const;
     QVector3D position() const;
     QVector3D scale() const;
     QVector3D pivot() const;
@@ -112,7 +111,7 @@ public:
     QVector3D right() const;
 
     QVector3D scenePosition() const;
-    Q_REVISION(1, 1) QQuaternion sceneRotation() const;
+    QQuaternion sceneRotation() const;
     QVector3D sceneScale() const;
     QMatrix4x4 sceneTransform() const;
 
@@ -138,8 +137,8 @@ public Q_SLOTS:
     void setX(float x);
     void setY(float y);
     void setZ(float z);
-    Q_REVISION(1, 1) void setRotation(const QQuaternion &rotation);
-    Q_REVISION(1, 1) void setEulerRotation(const QVector3D &eulerRotation);
+    void setRotation(const QQuaternion &rotation);
+    void setEulerRotation(const QVector3D &eulerRotation);
     void setPosition(const QVector3D &position);
     void setScale(const QVector3D &scale);
     void setPivot(const QVector3D &pivot);
@@ -151,8 +150,8 @@ Q_SIGNALS:
     void xChanged();
     void yChanged();
     void zChanged();
-    Q_REVISION(1, 1) void rotationChanged();
-    Q_REVISION(1, 1) void eulerRotationChanged();
+    void rotationChanged();
+    void eulerRotationChanged();
     void positionChanged();
     void scaleChanged();
     void pivotChanged();
diff --git a/src/quick3d/qquick3dobject.h b/src/quick3d/qquick3dobject.h
index 759d4362..e74a585b 100644
--- a/src/quick3d/qquick3dobject.h
+++ b/src/quick3d/qquick3dobject.h
@@ -66,7 +66,6 @@ class Q_QUICK3D_EXPORT QQuick3DObject : public QObject, public QQmlParserStatus
 
     QML_NAMED_ELEMENT(Object3D)
     QML_UNCREATABLE("Object3D is Abstract")
-    QML_ADDED_IN_VERSION(1, 14)
 public:
     enum ItemChange {
         ItemChildAddedChange, // value.item
diff --git a/src/quick3d/qquick3dorthographiccamera_p.h b/src/quick3d/qquick3dorthographiccamera_p.h
index c839c0ee..f3efd680 100644
--- a/src/quick3d/qquick3dorthographiccamera_p.h
+++ b/src/quick3d/qquick3dorthographiccamera_p.h
@@ -55,7 +55,6 @@ class Q_QUICK3D_EXPORT QQuick3DOrthographicCamera : public QQuick3DCamera
     Q_PROPERTY(float verticalMagnification READ verticalMagnification WRITE setVerticalMagnification NOTIFY verticalMagnificationChanged)
 
     QML_NAMED_ELEMENT(OrthographicCamera)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     explicit QQuick3DOrthographicCamera(QQuick3DNode *parent = nullptr);
diff --git a/src/quick3d/qquick3dperspectivecamera_p.h b/src/quick3d/qquick3dperspectivecamera_p.h
index 73fe4ebb..d49699dd 100644
--- a/src/quick3d/qquick3dperspectivecamera_p.h
+++ b/src/quick3d/qquick3dperspectivecamera_p.h
@@ -55,7 +55,6 @@ class Q_QUICK3D_EXPORT QQuick3DPerspectiveCamera : public QQuick3DCamera
     Q_PROPERTY(FieldOfViewOrientation fieldOfViewOrientation READ fieldOfViewOrientation WRITE setFieldOfViewOrientation NOTIFY fieldOfViewOrientationChanged)
 
     QML_NAMED_ELEMENT(PerspectiveCamera)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     enum FieldOfViewOrientation {
diff --git a/src/quick3d/qquick3dpointlight_p.h b/src/quick3d/qquick3dpointlight_p.h
index 7662d2c5..3f5822a9 100644
--- a/src/quick3d/qquick3dpointlight_p.h
+++ b/src/quick3d/qquick3dpointlight_p.h
@@ -55,7 +55,6 @@ class Q_QUICK3D_EXPORT QQuick3DPointLight : public QQuick3DAbstractLight
     Q_PROPERTY(float quadraticFade READ quadraticFade WRITE setQuadraticFade NOTIFY quadraticFadeChanged)
 
     QML_NAMED_ELEMENT(PointLight)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     explicit QQuick3DPointLight(QQuick3DNode *parent = nullptr);
diff --git a/src/quick3d/qquick3dprincipledmaterial_p.h b/src/quick3d/qquick3dprincipledmaterial_p.h
index a481ae50..a89dbe47 100644
--- a/src/quick3d/qquick3dprincipledmaterial_p.h
+++ b/src/quick3d/qquick3dprincipledmaterial_p.h
@@ -60,7 +60,7 @@ class Q_QUICK3D_EXPORT QQuick3DPrincipledMaterial : public QQuick3DMaterial
 
     Q_PROPERTY(float metalness READ metalness WRITE setMetalness NOTIFY metalnessChanged)
     Q_PROPERTY(QQuick3DTexture *metalnessMap READ metalnessMap WRITE setMetalnessMap NOTIFY metalnessMapChanged)
-    Q_PROPERTY(TextureChannelMapping metalnessChannel READ metalnessChannel WRITE setMetalnessChannel NOTIFY metalnessChannelChanged REVISION(1, 1))
+    Q_PROPERTY(TextureChannelMapping metalnessChannel READ metalnessChannel WRITE setMetalnessChannel NOTIFY metalnessChannelChanged)
 
     Q_PROPERTY(float specularAmount READ specularAmount WRITE setSpecularAmount NOTIFY specularAmountChanged)
     Q_PROPERTY(QQuick3DTexture *specularMap READ specularMap WRITE setSpecularMap NOTIFY specularMapChanged)
@@ -68,14 +68,14 @@ class Q_QUICK3D_EXPORT QQuick3DPrincipledMaterial : public QQuick3DMaterial
 
     Q_PROPERTY(float roughness READ roughness WRITE setRoughness NOTIFY roughnessChanged)
     Q_PROPERTY(QQuick3DTexture *roughnessMap READ roughnessMap WRITE setRoughnessMap NOTIFY roughnessMapChanged)
-    Q_PROPERTY(TextureChannelMapping roughnessChannel READ roughnessChannel WRITE setRoughnessChannel NOTIFY roughnessChannelChanged REVISION(1, 1))
+    Q_PROPERTY(TextureChannelMapping roughnessChannel READ roughnessChannel WRITE setRoughnessChannel NOTIFY roughnessChannelChanged)
 
     Q_PROPERTY(QVector3D emissiveFactor READ emissiveFactor WRITE setEmissiveFactor NOTIFY emissiveFactorChanged)
     Q_PROPERTY(QQuick3DTexture *emissiveMap READ emissiveMap WRITE setEmissiveMap NOTIFY emissiveMapChanged)
 
     Q_PROPERTY(float opacity READ opacity WRITE setOpacity NOTIFY opacityChanged)
     Q_PROPERTY(QQuick3DTexture *opacityMap READ opacityMap WRITE setOpacityMap NOTIFY opacityMapChanged)
-    Q_PROPERTY(TextureChannelMapping opacityChannel READ opacityChannel WRITE setOpacityChannel NOTIFY opacityChannelChanged REVISION(1, 1))
+    Q_PROPERTY(TextureChannelMapping opacityChannel READ opacityChannel WRITE setOpacityChannel NOTIFY opacityChannelChanged)
 
     Q_PROPERTY(QQuick3DTexture *normalMap READ normalMap WRITE setNormalMap NOTIFY normalMapChanged)
     Q_PROPERTY(float normalStrength READ normalStrength WRITE setNormalStrength NOTIFY normalStrengthChanged)
@@ -83,7 +83,7 @@ class Q_QUICK3D_EXPORT QQuick3DPrincipledMaterial : public QQuick3DMaterial
     Q_PROPERTY(QQuick3DTexture *specularReflectionMap READ specularReflectionMap WRITE setSpecularReflectionMap NOTIFY specularReflectionMapChanged)
 
     Q_PROPERTY(QQuick3DTexture *occlusionMap READ occlusionMap WRITE setOcclusionMap NOTIFY occlusionMapChanged)
-    Q_PROPERTY(TextureChannelMapping occlusionChannel READ occlusionChannel WRITE setOcclusionChannel NOTIFY occlusionChannelChanged REVISION(1, 1))
+    Q_PROPERTY(TextureChannelMapping occlusionChannel READ occlusionChannel WRITE setOcclusionChannel NOTIFY occlusionChannelChanged)
     Q_PROPERTY(float occlusionAmount READ occlusionAmount WRITE setOcclusionAmount NOTIFY occlusionAmountChanged)
 
     Q_PROPERTY(AlphaMode alphaMode READ alphaMode WRITE setAlphaMode NOTIFY alphaModeChanged)
@@ -99,7 +99,6 @@ class Q_QUICK3D_EXPORT QQuick3DPrincipledMaterial : public QQuick3DMaterial
     Q_PROPERTY(int maxHeightMapSamples READ maxHeightMapSamples WRITE setMaxHeightMapSamples NOTIFY maxHeightMapSamplesChanged)
 
     QML_NAMED_ELEMENT(PrincipledMaterial)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     enum Lighting {
@@ -148,10 +147,10 @@ public:
     float occlusionAmount() const;
     AlphaMode alphaMode() const;
     float alphaCutoff() const;
-    Q_REVISION(1, 1) TextureChannelMapping metalnessChannel() const;
-    Q_REVISION(1, 1) TextureChannelMapping roughnessChannel() const;
-    Q_REVISION(1, 1) TextureChannelMapping opacityChannel() const;
-    Q_REVISION(1, 1) TextureChannelMapping occlusionChannel() const;
+    TextureChannelMapping metalnessChannel() const;
+    TextureChannelMapping roughnessChannel() const;
+    TextureChannelMapping opacityChannel() const;
+    TextureChannelMapping occlusionChannel() const;
     float pointSize() const;
     float lineWidth() const;
     Q_REVISION(6, 2) QQuick3DTexture *heightMap() const;
@@ -183,10 +182,10 @@ public Q_SLOTS:
     void setOcclusionAmount(float occlusionAmount);
     void setAlphaMode(QQuick3DPrincipledMaterial::AlphaMode alphaMode);
     void setAlphaCutoff(float alphaCutoff);
-    Q_REVISION(1, 1) void setMetalnessChannel(QQuick3DMaterial::TextureChannelMapping channel);
-    Q_REVISION(1, 1) void setRoughnessChannel(QQuick3DMaterial::TextureChannelMapping channel);
-    Q_REVISION(1, 1) void setOpacityChannel(QQuick3DMaterial::TextureChannelMapping channel);
-    Q_REVISION(1, 1) void setOcclusionChannel(QQuick3DMaterial::TextureChannelMapping channel);
+    void setMetalnessChannel(QQuick3DMaterial::TextureChannelMapping channel);
+    void setRoughnessChannel(QQuick3DMaterial::TextureChannelMapping channel);
+    void setOpacityChannel(QQuick3DMaterial::TextureChannelMapping channel);
+    void setOcclusionChannel(QQuick3DMaterial::TextureChannelMapping channel);
     void setPointSize(float size);
     void setLineWidth(float width);
     Q_REVISION(6, 2) void setHeightMap(QQuick3DTexture *heightMap);
@@ -218,10 +217,10 @@ Q_SIGNALS:
     void occlusionAmountChanged(float occlusionAmount);
     void alphaModeChanged(QQuick3DPrincipledMaterial::AlphaMode alphaMode);
     void alphaCutoffChanged(float alphaCutoff);
-    Q_REVISION(1, 1) void metalnessChannelChanged(QQuick3DMaterial::TextureChannelMapping channel);
-    Q_REVISION(1, 1) void roughnessChannelChanged(QQuick3DMaterial::TextureChannelMapping channel);
-    Q_REVISION(1, 1) void opacityChannelChanged(QQuick3DMaterial::TextureChannelMapping channel);
-    Q_REVISION(1, 1) void occlusionChannelChanged(QQuick3DMaterial::TextureChannelMapping channel);
+    void metalnessChannelChanged(QQuick3DMaterial::TextureChannelMapping channel);
+    void roughnessChannelChanged(QQuick3DMaterial::TextureChannelMapping channel);
+    void opacityChannelChanged(QQuick3DMaterial::TextureChannelMapping channel);
+    void occlusionChannelChanged(QQuick3DMaterial::TextureChannelMapping channel);
     void pointSizeChanged();
     void lineWidthChanged();
     Q_REVISION(6, 2) void heightMapChanged(QQuick3DTexture *heightMap);
diff --git a/src/quick3d/qquick3dquaternionanimation_p.h b/src/quick3d/qquick3dquaternionanimation_p.h
index be7282f9..4f525bc8 100644
--- a/src/quick3d/qquick3dquaternionanimation_p.h
+++ b/src/quick3d/qquick3dquaternionanimation_p.h
@@ -66,7 +66,6 @@ class Q_QUICK3D_EXPORT QQuick3DQuaternionAnimation : public QQuickPropertyAnimat
     Q_PROPERTY(float toZRotation READ toZRotation WRITE setToZRotation NOTIFY toZRotationChanged)
 
     QML_NAMED_ELEMENT(QuaternionAnimation)
-    QML_ADDED_IN_VERSION(1, 15)
 
 public:
     enum Type {
diff --git a/src/quick3d/qquick3dquaternionutils_p.h b/src/quick3d/qquick3dquaternionutils_p.h
index 33269e4c..76b3c1c7 100644
--- a/src/quick3d/qquick3dquaternionutils_p.h
+++ b/src/quick3d/qquick3dquaternionutils_p.h
@@ -55,7 +55,6 @@ class Q_QUICK3D_EXPORT QQuick3DQuaternionUtils : public QObject
     Q_OBJECT
 
     QML_NAMED_ELEMENT(Quaternion)
-    QML_ADDED_IN_VERSION(1, 15)
     QML_SINGLETON
 
 public:
@@ -76,12 +75,10 @@ public:
     Q_INVOKABLE static QQuaternion fromEulerAngles(float x, float y, float z);
     Q_INVOKABLE static QQuaternion fromEulerAngles(const QVector3D &eulerAngles);
 
-    Q_REVISION(1, 1) Q_INVOKABLE static QQuaternion lookAt(const QVector3D &sourcePosition,
-                                                        const QVector3D &targetPosition,
-                                                        const QVector3D &forwardDirection
-                                                        = QVector3D(0, 0, -1),
-                                                        const QVector3D &upDirection
-                                                        = QVector3D(0, 1, 0));
+    Q_INVOKABLE static QQuaternion lookAt(const QVector3D &sourcePosition,
+                                          const QVector3D &targetPosition,
+                                          const QVector3D &forwardDirection = QVector3D(0, 0, -1),
+                                          const QVector3D &upDirection = QVector3D(0, 1, 0));
 
 };
 
diff --git a/src/quick3d/qquick3drepeater_p.h b/src/quick3d/qquick3drepeater_p.h
index 47d204e3..32c99f83 100644
--- a/src/quick3d/qquick3drepeater_p.h
+++ b/src/quick3d/qquick3drepeater_p.h
@@ -62,7 +62,6 @@ class Q_QUICK3D_EXPORT QQuick3DRepeater : public QQuick3DNode
     Q_CLASSINFO("DefaultProperty", "delegate")
 
     QML_NAMED_ELEMENT(Repeater3D)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     QQuick3DRepeater(QQuick3DNode *parent = nullptr);
diff --git a/src/quick3d/qquick3dsceneenvironment_p.h b/src/quick3d/qquick3dsceneenvironment_p.h
index 3b2a4f33..47beaddd 100644
--- a/src/quick3d/qquick3dsceneenvironment_p.h
+++ b/src/quick3d/qquick3dsceneenvironment_p.h
@@ -82,10 +82,9 @@ class Q_QUICK3D_EXPORT QQuick3DSceneEnvironment : public QQuick3DObject
 
     Q_PROPERTY(QQuick3DEnvironmentTonemapModes tonemapMode READ tonemapMode WRITE setTonemapMode NOTIFY tonemapModeChanged)
 
-    Q_PROPERTY(QQmlListProperty<QQuick3DEffect> effects READ effects REVISION(1, 1))
+    Q_PROPERTY(QQmlListProperty<QQuick3DEffect> effects READ effects)
 
     QML_NAMED_ELEMENT(SceneEnvironment)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
 
diff --git a/src/quick3d/qquick3dshaderutils_p.h b/src/quick3d/qquick3dshaderutils_p.h
index 34056dfe..1d908db3 100644
--- a/src/quick3d/qquick3dshaderutils_p.h
+++ b/src/quick3d/qquick3dshaderutils_p.h
@@ -74,7 +74,6 @@ class Q_QUICK3D_EXPORT QQuick3DShaderUtilsTextureInput : public QObject
     Q_PROPERTY(bool enabled MEMBER enabled NOTIFY enabledChanged)
 
     QML_NAMED_ELEMENT(TextureInput)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     QQuick3DShaderUtilsTextureInput() = default;
@@ -106,7 +105,6 @@ class Q_QUICK3D_EXPORT QQuick3DShaderUtilsBuffer : public QObject
     Q_PROPERTY(QByteArray name MEMBER name)
 
     QML_NAMED_ELEMENT(Buffer)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     QQuick3DShaderUtilsBuffer() = default;
@@ -174,7 +172,6 @@ class Q_QUICK3D_EXPORT QQuick3DShaderUtilsRenderCommand : public QObject
     Q_OBJECT
 
     QML_NAMED_ELEMENT(Command)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     QQuick3DShaderUtilsRenderCommand() = default;
@@ -191,7 +188,6 @@ class Q_QUICK3D_EXPORT QQuick3DShaderUtilsBufferInput : public QQuick3DShaderUti
     Q_PROPERTY(QByteArray sampler MEMBER sampler)
 
     QML_NAMED_ELEMENT(BufferInput)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     QQuick3DShaderUtilsBufferInput() = default;
@@ -230,7 +226,6 @@ class Q_QUICK3D_EXPORT QQuick3DShaderUtilsApplyValue : public QQuick3DShaderUtil
     Q_PROPERTY(QVariant value MEMBER value)
 
     QML_NAMED_ELEMENT(SetUniformValue)
-    QML_ADDED_IN_VERSION(1, 15)
 
 public:
     QQuick3DShaderUtilsApplyValue() = default;
@@ -249,7 +244,6 @@ class Q_QUICK3D_EXPORT QQuick3DShaderUtilsRenderPass : public QObject
     Q_PROPERTY(QQmlListProperty<QQuick3DShaderUtilsShader> shaders READ shaders)
 
     QML_NAMED_ELEMENT(Pass)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     QQuick3DShaderUtilsRenderPass() = default;
@@ -279,7 +273,6 @@ class Q_QUICK3D_EXPORT QQuick3DShaderUtilsShader : public QObject
     Q_PROPERTY(Stage stage MEMBER stage)
 
     QML_NAMED_ELEMENT(Shader)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     QQuick3DShaderUtilsShader() = default;
diff --git a/src/quick3d/qquick3dskeleton_p.h b/src/quick3d/qquick3dskeleton_p.h
index 934ad580..e3160da0 100644
--- a/src/quick3d/qquick3dskeleton_p.h
+++ b/src/quick3d/qquick3dskeleton_p.h
@@ -50,7 +50,6 @@ class Q_QUICK3D_EXPORT QQuick3DSkeleton : public QQuick3DNode
     Q_OBJECT
 
     QML_NAMED_ELEMENT(Skeleton)
-    QML_ADDED_IN_VERSION(1, 15)
 
 public:
     explicit QQuick3DSkeleton(QQuick3DNode *parent = nullptr);
diff --git a/src/quick3d/qquick3dspotlight_p.h b/src/quick3d/qquick3dspotlight_p.h
index 36d6fc46..55ddde70 100644
--- a/src/quick3d/qquick3dspotlight_p.h
+++ b/src/quick3d/qquick3dspotlight_p.h
@@ -55,7 +55,6 @@ class Q_QUICK3D_EXPORT QQuick3DSpotLight : public QQuick3DAbstractLight
     Q_PROPERTY(float innerConeAngle READ innerConeAngle WRITE setInnerConeAngle NOTIFY innerConeAngleChanged)
 
     QML_NAMED_ELEMENT(SpotLight)
-    QML_ADDED_IN_VERSION(1, 15)
 
 public:
     explicit QQuick3DSpotLight(QQuick3DNode *parent = nullptr);
diff --git a/src/quick3d/qquick3dtexture_p.h b/src/quick3d/qquick3dtexture_p.h
index ff8a1509..e9ae6a8b 100644
--- a/src/quick3d/qquick3dtexture_p.h
+++ b/src/quick3d/qquick3dtexture_p.h
@@ -80,7 +80,6 @@ class Q_QUICK3D_EXPORT QQuick3DTexture : public QQuick3DObject, public QQuickIte
     Q_PROPERTY(bool autoOrientation READ autoOrientation WRITE setAutoOrientation NOTIFY autoOrientationChanged REVISION(6, 2))
 
     QML_NAMED_ELEMENT(Texture)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     enum MappingMode
diff --git a/src/quick3d/qquick3dviewport_p.h b/src/quick3d/qquick3dviewport_p.h
index 54f07528..43b1dcc7 100644
--- a/src/quick3d/qquick3dviewport_p.h
+++ b/src/quick3d/qquick3dviewport_p.h
@@ -77,7 +77,6 @@ class Q_QUICK3D_EXPORT QQuick3DViewport : public QQuickItem
     Q_CLASSINFO("DefaultProperty", "data")
 
     QML_NAMED_ELEMENT(View3D)
-    QML_ADDED_IN_VERSION(1, 14)
 
 public:
     enum RenderMode {
diff --git a/src/quick3dparticles/CMakeLists.txt b/src/quick3dparticles/CMakeLists.txt
index f2aae331..814ddb62 100644
--- a/src/quick3dparticles/CMakeLists.txt
+++ b/src/quick3dparticles/CMakeLists.txt
@@ -35,7 +35,6 @@ qt_internal_add_qml_module(Quick3DParticles
         qquick3dparticlevectordirection.cpp qquick3dparticlevectordirection_p.h
         qquick3dparticlewander.cpp qquick3dparticlewander_p.h
         qquick3dparticleutils.cpp qquick3dparticleutils_p.h
-        qquick3dparticleforeign_p.h
         qquick3dparticlespritesequence.cpp qquick3dparticlespritesequence_p.h
         qquick3dparticlemodelblendparticle_p.h qquick3dparticlemodelblendparticle.cpp
     DEFINES
diff --git a/src/quick3dparticles/qquick3dparticleforeign_p.h b/src/quick3dparticles/qquick3dparticleforeign_p.h
deleted file mode 100644
index c430c20b..00000000
--- a/src/quick3dparticles/qquick3dparticleforeign_p.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Quick 3D.
-**
-** $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 QQUICK3DPARTICLEFOREIGN_P_H
-#define QQUICK3DPARTICLEFOREIGN_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt 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.
-//
-
-// This is required so that Quick3D types are seen at compile time to
-// generate code for types inheriting from them.
-
-#include <QtQml/qqml.h>
-
-QT_BEGIN_NAMESPACE
-
-struct QQuick3DNodeForeign
-{
-    Q_GADGET
-    QML_ANONYMOUS
-    QML_FOREIGN(QQuick3DNode)
-    QML_ADDED_IN_VERSION(6, 2)
-};
-
-QT_END_NAMESPACE
-
-#endif // QQUICK3DPARTICLEFOREIGN_P_H