Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: I8daaee9c3a2667893be118613979bc7e07e26147

15 files changed, 248 insertions, 37 deletions

diff --git a/src/quick3d/imports/animation/plugins.qmltypes b/src/quick3d/imports/animation/plugins.qmltypes
index ad2bc8812..a8f207245 100644
--- a/src/quick3d/imports/animation/plugins.qmltypes
+++ b/src/quick3d/imports/animation/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt3D.Animation 2.12'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt3D.Animation 2.13'
 
 Module {
     dependencies: ["Qt3D.Core 2.0"]
diff --git a/src/quick3d/imports/core/plugins.qmltypes b/src/quick3d/imports/core/plugins.qmltypes
index 4c0719a97..390fd78fb 100644
--- a/src/quick3d/imports/core/plugins.qmltypes
+++ b/src/quick3d/imports/core/plugins.qmltypes
@@ -4,10 +4,10 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable Qt3D.Core 2.12'
+// 'qmlplugindump -nonrelocatable Qt3D.Core 2.13'
 
 Module {
-    dependencies: ["QtQuick 2.12"]
+    dependencies: ["QtQuick 2.0"]
     Component {
         name: "Qt3DCore::QAbstractSkeleton"
         prototype: "Qt3DCore::QNode"
diff --git a/src/quick3d/imports/extras/plugins.qmltypes b/src/quick3d/imports/extras/plugins.qmltypes
index ecfeaed8f..72857d402 100644
--- a/src/quick3d/imports/extras/plugins.qmltypes
+++ b/src/quick3d/imports/extras/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt3D.Extras 2.12'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt3D.Extras 2.13'
 
 Module {
     dependencies: ["Qt3D.Logic 2.0", "Qt3D.Render 2.0"]
diff --git a/src/quick3d/imports/input/plugins.qmltypes b/src/quick3d/imports/input/plugins.qmltypes
index a4662fc5e..8e9cac4d1 100644
--- a/src/quick3d/imports/input/plugins.qmltypes
+++ b/src/quick3d/imports/input/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt3D.Input 2.12'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt3D.Input 2.13'
 
 Module {
     dependencies: ["Qt3D.Core 2.0"]
diff --git a/src/quick3d/imports/logic/plugins.qmltypes b/src/quick3d/imports/logic/plugins.qmltypes
index 20071117d..294f6b068 100644
--- a/src/quick3d/imports/logic/plugins.qmltypes
+++ b/src/quick3d/imports/logic/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt3D.Logic 2.12'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt3D.Logic 2.13'
 
 Module {
     dependencies: ["Qt3D.Core 2.0"]
diff --git a/src/quick3d/imports/render/plugins.qmltypes b/src/quick3d/imports/render/plugins.qmltypes
index a801f99e0..f5f5b3c61 100644
--- a/src/quick3d/imports/render/plugins.qmltypes
+++ b/src/quick3d/imports/render/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt3D.Render 2.12'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt3D.Render 2.13'
 
 Module {
     dependencies: ["Qt3D.Core 2.0"]
@@ -48,6 +48,7 @@ Module {
         Property { name: "visibility"; revision: 1; type: "Visibility" }
         Property { name: "contentOrientation"; type: "Qt::ScreenOrientation" }
         Property { name: "opacity"; revision: 1; type: "double" }
+        Property { name: "transientParent"; revision: 13; type: "QWindow"; isPointer: true }
         Signal {
             name: "screenChanged"
             Parameter { name: "screen"; type: "QScreen"; isPointer: true }
@@ -120,6 +121,11 @@ Module {
             revision: 1
             Parameter { name: "opacity"; type: "double" }
         }
+        Signal {
+            name: "transientParentChanged"
+            revision: 13
+            Parameter { name: "transientParent"; type: "QWindow"; isPointer: true }
+        }
         Method { name: "requestActivate"; revision: 1 }
         Method {
             name: "setVisible"
@@ -268,9 +274,9 @@ Module {
     Component {
         name: "Qt3DRender::QAbstractTexture"
         prototype: "Qt3DCore::QNode"
-        exports: ["Qt3D.Render/Texture 2.0"]
+        exports: ["Qt3D.Render/Texture 2.0", "Qt3D.Render/Texture 2.13"]
         isCreatable: false
-        exportMetaObjectRevisions: [0]
+        exportMetaObjectRevisions: [0, 13]
         Enum {
             name: "Status"
             values: {
@@ -443,6 +449,13 @@ Module {
                 "CompareNone": 0
             }
         }
+        Enum {
+            name: "HandleType"
+            values: {
+                "NoHandle": 0,
+                "OpenGLTextureId": 1
+            }
+        }
         Property { name: "target"; type: "Target"; isReadonly: true }
         Property { name: "format"; type: "TextureFormat" }
         Property { name: "generateMipMaps"; type: "bool" }
@@ -463,6 +476,8 @@ Module {
         Property { name: "comparisonMode"; type: "ComparisonMode" }
         Property { name: "layers"; type: "int" }
         Property { name: "samples"; type: "int" }
+        Property { name: "handleType"; revision: 13; type: "HandleType"; isReadonly: true }
+        Property { name: "handle"; revision: 13; type: "QVariant"; isReadonly: true }
         Signal {
             name: "formatChanged"
             Parameter { name: "format"; type: "TextureFormat" }
@@ -515,6 +530,16 @@ Module {
             name: "samplesChanged"
             Parameter { name: "samples"; type: "int" }
         }
+        Signal {
+            name: "handleTypeChanged"
+            revision: 13
+            Parameter { name: "handleType"; type: "HandleType" }
+        }
+        Signal {
+            name: "handleChanged"
+            revision: 13
+            Parameter { name: "handle"; type: "QVariant" }
+        }
         Method {
             name: "setFormat"
             Parameter { name: "format"; type: "TextureFormat" }
@@ -644,8 +669,12 @@ Module {
     Component {
         name: "Qt3DRender::QAttribute"
         prototype: "Qt3DCore::QNode"
-        exports: ["Qt3D.Render/Attribute 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "Qt3D.Render/Attribute 2.0",
+            "Qt3D.Render/Attribute 2.10",
+            "Qt3D.Render/Attribute 2.11"
+        ]
+        exportMetaObjectRevisions: [0, 10, 11]
         Enum {
             name: "AttributeType"
             values: {
@@ -1557,11 +1586,22 @@ Module {
     Component {
         name: "Qt3DRender::QComputeCommand"
         prototype: "Qt3DCore::QComponent"
-        exports: ["Qt3D.Render/ComputeCommand 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "Qt3D.Render/ComputeCommand 2.0",
+            "Qt3D.Render/ComputeCommand 2.13"
+        ]
+        exportMetaObjectRevisions: [0, 13]
+        Enum {
+            name: "RunType"
+            values: {
+                "Continuous": 0,
+                "Manual": 1
+            }
+        }
         Property { name: "workGroupX"; type: "int" }
         Property { name: "workGroupY"; type: "int" }
         Property { name: "workGroupZ"; type: "int" }
+        Property { name: "runType"; revision: 13; type: "RunType" }
         Method {
             name: "setWorkGroupX"
             Parameter { name: "workGroupX"; type: "int" }
@@ -1574,6 +1614,32 @@ Module {
             name: "setWorkGroupZ"
             Parameter { name: "workGroupZ"; type: "int" }
         }
+        Method {
+            name: "setRunType"
+            revision: 13
+            Parameter { name: "runType"; type: "RunType" }
+        }
+        Method {
+            name: "trigger"
+            revision: 13
+            Parameter { name: "frameCount"; type: "int" }
+        }
+        Method { name: "trigger"; revision: 13 }
+        Method {
+            name: "trigger"
+            revision: 13
+            Parameter { name: "workGroupX"; type: "int" }
+            Parameter { name: "workGroupY"; type: "int" }
+            Parameter { name: "workGroupZ"; type: "int" }
+            Parameter { name: "frameCount"; type: "int" }
+        }
+        Method {
+            name: "trigger"
+            revision: 13
+            Parameter { name: "workGroupX"; type: "int" }
+            Parameter { name: "workGroupY"; type: "int" }
+            Parameter { name: "workGroupZ"; type: "int" }
+        }
     }
     Component {
         name: "Qt3DRender::QCullFace"
@@ -1787,10 +1853,22 @@ Module {
             type: "Qt3DRender::QAttribute"
             isPointer: true
         }
+        Property { name: "minExtent"; revision: 13; type: "QVector3D"; isReadonly: true }
+        Property { name: "maxExtent"; revision: 13; type: "QVector3D"; isReadonly: true }
         Signal {
             name: "boundingVolumePositionAttributeChanged"
             Parameter { name: "boundingVolumePositionAttribute"; type: "QAttribute"; isPointer: true }
         }
+        Signal {
+            name: "minExtentChanged"
+            revision: 13
+            Parameter { name: "minExtent"; type: "QVector3D" }
+        }
+        Signal {
+            name: "maxExtentChanged"
+            revision: 13
+            Parameter { name: "maxExtent"; type: "QVector3D" }
+        }
         Method {
             name: "setBoundingVolumePositionAttribute"
             Parameter { name: "boundingVolumePositionAttribute"; type: "QAttribute"; isPointer: true }
@@ -2261,13 +2339,15 @@ Module {
         prototype: "Qt3DCore::QComponent"
         exports: [
             "Qt3D.Render/ObjectPicker 2.0",
+            "Qt3D.Render/ObjectPicker 2.13",
             "Qt3D.Render/ObjectPicker 2.9"
         ]
-        exportMetaObjectRevisions: [0, 9]
+        exportMetaObjectRevisions: [0, 13, 9]
         Property { name: "hoverEnabled"; type: "bool" }
         Property { name: "dragEnabled"; type: "bool" }
         Property { name: "pressed"; type: "bool"; isReadonly: true }
         Property { name: "containsMouse"; type: "bool"; isReadonly: true }
+        Property { name: "priority"; revision: 13; type: "int" }
         Signal {
             name: "pressed"
             Parameter { name: "pick"; type: "Qt3DRender::QPickEvent"; isPointer: true }
@@ -2302,6 +2382,11 @@ Module {
             name: "containsMouseChanged"
             Parameter { name: "containsMouse"; type: "bool" }
         }
+        Signal {
+            name: "priorityChanged"
+            revision: 13
+            Parameter { name: "priority"; type: "int" }
+        }
         Method {
             name: "setHoverEnabled"
             Parameter { name: "hoverEnabled"; type: "bool" }
@@ -2310,6 +2395,11 @@ Module {
             name: "setDragEnabled"
             Parameter { name: "dragEnabled"; type: "bool" }
         }
+        Method {
+            name: "setPriority"
+            revision: 13
+            Parameter { name: "priority"; type: "int" }
+        }
     }
     Component {
         name: "Qt3DRender::QParameter"
@@ -2399,7 +2489,8 @@ Module {
             name: "PickResultMode"
             values: {
                 "NearestPick": 0,
-                "AllPicks": 1
+                "AllPicks": 1,
+                "NearestPriorityPick": 2
             }
         }
         Enum {
@@ -3030,6 +3121,29 @@ Module {
         exportMetaObjectRevisions: [0]
     }
     Component {
+        name: "Qt3DRender::QSetFence"
+        prototype: "Qt3DRender::QFrameGraphNode"
+        exports: ["Qt3D.Render/SetFence 2.13"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "HandleType"
+            values: {
+                "NoHandle": 0,
+                "OpenGLFenceId": 1
+            }
+        }
+        Property { name: "handleType"; type: "HandleType"; isReadonly: true }
+        Property { name: "handle"; type: "QVariant"; isReadonly: true }
+        Signal {
+            name: "handleTypeChanged"
+            Parameter { name: "handleType"; type: "HandleType" }
+        }
+        Signal {
+            name: "handleChanged"
+            Parameter { name: "handle"; type: "QVariant" }
+        }
+    }
+    Component {
         name: "Qt3DRender::QShaderData"
         prototype: "Qt3DCore::QComponent"
         exports: ["Qt3D.Render/QShaderData 2.0"]
@@ -3136,8 +3250,11 @@ Module {
     Component {
         name: "Qt3DRender::QShaderProgramBuilder"
         prototype: "Qt3DCore::QNode"
-        exports: ["Qt3D.Render/ShaderProgramBuilder 2.10"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "Qt3D.Render/ShaderProgramBuilder 2.10",
+            "Qt3D.Render/ShaderProgramBuilder 2.13"
+        ]
+        exportMetaObjectRevisions: [0, 13]
         Property { name: "shaderProgram"; type: "Qt3DRender::QShaderProgram"; isPointer: true }
         Property { name: "enabledLayers"; type: "QStringList" }
         Property { name: "vertexShaderGraph"; type: "QUrl" }
@@ -3146,6 +3263,22 @@ Module {
         Property { name: "geometryShaderGraph"; type: "QUrl" }
         Property { name: "fragmentShaderGraph"; type: "QUrl" }
         Property { name: "computeShaderGraph"; type: "QUrl" }
+        Property { name: "vertexShaderCode"; revision: 13; type: "QByteArray"; isReadonly: true }
+        Property {
+            name: "tessellationControlShaderCode"
+            revision: 13
+            type: "QByteArray"
+            isReadonly: true
+        }
+        Property {
+            name: "tessellationEvaluationShaderCode"
+            revision: 13
+            type: "QByteArray"
+            isReadonly: true
+        }
+        Property { name: "geometryShaderCode"; revision: 13; type: "QByteArray"; isReadonly: true }
+        Property { name: "fragmentShaderCode"; revision: 13; type: "QByteArray"; isReadonly: true }
+        Property { name: "computeShaderCode"; revision: 13; type: "QByteArray"; isReadonly: true }
         Signal {
             name: "shaderProgramChanged"
             Parameter { name: "shaderProgram"; type: "Qt3DRender::QShaderProgram"; isPointer: true }
@@ -3178,6 +3311,36 @@ Module {
             name: "computeShaderGraphChanged"
             Parameter { name: "computeShaderGraph"; type: "QUrl" }
         }
+        Signal {
+            name: "vertexShaderCodeChanged"
+            revision: 13
+            Parameter { name: "vertexShaderCode"; type: "QByteArray" }
+        }
+        Signal {
+            name: "tessellationControlShaderCodeChanged"
+            revision: 13
+            Parameter { name: "tessellationControlShaderCode"; type: "QByteArray" }
+        }
+        Signal {
+            name: "tessellationEvaluationShaderCodeChanged"
+            revision: 13
+            Parameter { name: "tessellationEvaluationShaderCode"; type: "QByteArray" }
+        }
+        Signal {
+            name: "geometryShaderCodeChanged"
+            revision: 13
+            Parameter { name: "geometryShaderCode"; type: "QByteArray" }
+        }
+        Signal {
+            name: "fragmentShaderCodeChanged"
+            revision: 13
+            Parameter { name: "fragmentShaderCode"; type: "QByteArray" }
+        }
+        Signal {
+            name: "computeShaderCodeChanged"
+            revision: 13
+            Parameter { name: "computeShaderCode"; type: "QByteArray" }
+        }
         Method {
             name: "setShaderProgram"
             Parameter { name: "program"; type: "Qt3DRender::QShaderProgram"; isPointer: true }
@@ -3212,6 +3375,21 @@ Module {
         }
     }
     Component {
+        name: "Qt3DRender::QSharedGLTexture"
+        prototype: "Qt3DRender::QAbstractTexture"
+        exports: ["Qt3D.Render/SharedGLTexture 2.13"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "textureId"; type: "int" }
+        Signal {
+            name: "textureIdChanged"
+            Parameter { name: "textureId"; type: "int" }
+        }
+        Method {
+            name: "setTextureId"
+            Parameter { name: "id"; type: "int" }
+        }
+    }
+    Component {
         name: "Qt3DRender::QSortPolicy"
         prototype: "Qt3DRender::QFrameGraphNode"
         exports: ["Qt3D.Render/SortPolicy 2.0"]
@@ -3821,6 +3999,39 @@ Module {
         }
     }
     Component {
+        name: "Qt3DRender::QWaitFence"
+        prototype: "Qt3DRender::QFrameGraphNode"
+        exports: ["Qt3D.Render/WaitFence 2.13"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "HandleType"
+            values: {
+                "NoHandle": 0,
+                "OpenGLFenceId": 1
+            }
+        }
+        Property { name: "handleType"; type: "HandleType" }
+        Property { name: "handle"; type: "QVariant" }
+        Property { name: "waitOnCPU"; type: "bool" }
+        Property { name: "timeout"; type: "qulonglong" }
+        Signal {
+            name: "waitOnCPUChanged"
+            Parameter { name: "waitOnCPU"; type: "bool" }
+        }
+        Signal {
+            name: "timeoutChanged"
+            Parameter { name: "timeoutChanged"; type: "qulonglong" }
+        }
+        Signal {
+            name: "handleTypeChanged"
+            Parameter { name: "handleType"; type: "HandleType" }
+        }
+        Signal {
+            name: "handleChanged"
+            Parameter { name: "handle"; type: "QVariant" }
+        }
+    }
+    Component {
         name: "Qt3DRender::Render::Quick::Quick3DBuffer"
         prototype: "Qt3DRender::QBuffer"
         exports: ["Qt3D.Render/Buffer 2.0"]
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index e9314e32b..4f1b2b1e7 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -183,7 +183,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
     qmlRegisterType<Qt3DRender::QShaderProgram>(uri, 2, 0, "ShaderProgram");
     qmlRegisterType<Qt3DRender::QShaderProgram, 9>(uri, 2, 9, "ShaderProgram");
     qmlRegisterType<Qt3DRender::QShaderProgramBuilder>(uri, 2, 10, "ShaderProgramBuilder");
-    qmlRegisterType<Qt3DRender::QShaderProgramBuilder>(uri, 2, 13, "ShaderProgramBuilder");
+    qmlRegisterType<Qt3DRender::QShaderProgramBuilder, 13>(uri, 2, 13, "ShaderProgramBuilder");
     qmlRegisterUncreatableType<Qt3DRender::QShaderData>(uri, 2, 0, "QShaderData", "Quick3D should instantiate Quick3DShaderData only");
     qmlRegisterType<Qt3DRender::Render::Quick::Quick3DShaderDataArray>(uri, 2, 0, "ShaderDataArray");
     qmlRegisterType<Qt3DRender::Render::Quick::Quick3DShaderData>(uri, 2, 0, "ShaderData");
diff --git a/src/quick3d/imports/scene2d/plugins.qmltypes b/src/quick3d/imports/scene2d/plugins.qmltypes
index 783dff7a3..9d2c855a6 100644
--- a/src/quick3d/imports/scene2d/plugins.qmltypes
+++ b/src/quick3d/imports/scene2d/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Scene2D 2.12'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Scene2D 2.13'
 
 Module {
     dependencies: ["Qt3D.Core 2.0", "Qt3D.Render 2.0"]
diff --git a/src/quick3d/imports/scene3d/plugins.qmltypes b/src/quick3d/imports/scene3d/plugins.qmltypes
index 65526a450..da3d7ec3e 100644
--- a/src/quick3d/imports/scene3d/plugins.qmltypes
+++ b/src/quick3d/imports/scene3d/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Scene3D 2.12'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Scene3D 2.13'
 
 Module {
     dependencies: ["Qt3D.Core 2.0", "QtQuick 2.0"]
diff --git a/src/render/frontend/qcomputecommand.h b/src/render/frontend/qcomputecommand.h
index ad7f89a4d..f0c251a9b 100644
--- a/src/render/frontend/qcomputecommand.h
+++ b/src/render/frontend/qcomputecommand.h
@@ -76,10 +76,10 @@ public Q_SLOTS:
     void setWorkGroupX(int workGroupX);
     void setWorkGroupY(int workGroupY);
     void setWorkGroupZ(int workGroupZ);
-    void setRunType(RunType runType);
+    Q_REVISION(13) void setRunType(RunType runType);
 
-    void trigger(int frameCount = 1);
-    void trigger(int workGroupX, int workGroupY, int workGroupZ, int frameCount = 1);
+    Q_REVISION(13) void trigger(int frameCount = 1);
+    Q_REVISION(13) void trigger(int workGroupX, int workGroupY, int workGroupZ, int frameCount = 1);
 
 Q_SIGNALS:
     void workGroupXChanged();
diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h
index 61508c7d2..6f9f5511f 100644
--- a/src/render/geometry/qgeometry.h
+++ b/src/render/geometry/qgeometry.h
@@ -73,8 +73,8 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void boundingVolumePositionAttributeChanged(QAttribute *boundingVolumePositionAttribute);
-    void minExtentChanged(const QVector3D &minExtent);
-    void maxExtentChanged(const QVector3D &maxExtent);
+    Q_REVISION(13) void minExtentChanged(const QVector3D &minExtent);
+    Q_REVISION(13) void maxExtentChanged(const QVector3D &maxExtent);
 protected:
     explicit QGeometry(QGeometryPrivate &dd, Qt3DCore::QNode *parent = nullptr);
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
diff --git a/src/render/materialsystem/qshaderprogrambuilder.h b/src/render/materialsystem/qshaderprogrambuilder.h
index 532aa7d73..33966b708 100644
--- a/src/render/materialsystem/qshaderprogrambuilder.h
+++ b/src/render/materialsystem/qshaderprogrambuilder.h
@@ -108,12 +108,12 @@ Q_SIGNALS:
     void geometryShaderGraphChanged(const QUrl &geometryShaderGraph);
     void fragmentShaderGraphChanged(const QUrl &fragmentShaderGraph);
     void computeShaderGraphChanged(const QUrl &computeShaderGraph);
-    void vertexShaderCodeChanged(const QByteArray &vertexShaderCode);
-    void tessellationControlShaderCodeChanged(const QByteArray &tessellationControlShaderCode);
-    void tessellationEvaluationShaderCodeChanged(const QByteArray &tessellationEvaluationShaderCode);
-    void geometryShaderCodeChanged(const QByteArray &geometryShaderCode);
-    void fragmentShaderCodeChanged(const QByteArray &fragmentShaderCode);
-    void computeShaderCodeChanged(const QByteArray &computeShaderCode);
+    Q_REVISION(13) void vertexShaderCodeChanged(const QByteArray &vertexShaderCode);
+    Q_REVISION(13) void tessellationControlShaderCodeChanged(const QByteArray &tessellationControlShaderCode);
+    Q_REVISION(13) void tessellationEvaluationShaderCodeChanged(const QByteArray &tessellationEvaluationShaderCode);
+    Q_REVISION(13) void geometryShaderCodeChanged(const QByteArray &geometryShaderCode);
+    Q_REVISION(13) void fragmentShaderCodeChanged(const QByteArray &fragmentShaderCode);
+    Q_REVISION(13) void computeShaderCodeChanged(const QByteArray &computeShaderCode);
 
 protected:
     explicit QShaderProgramBuilder(QShaderProgramBuilderPrivate &dd, Qt3DCore::QNode *parent = nullptr);
diff --git a/src/render/picking/qobjectpicker.h b/src/render/picking/qobjectpicker.h
index 1d15f6092..616f23873 100644
--- a/src/render/picking/qobjectpicker.h
+++ b/src/render/picking/qobjectpicker.h
@@ -75,7 +75,7 @@ public:
 public Q_SLOTS:
     void setHoverEnabled(bool hoverEnabled);
     void setDragEnabled(bool dragEnabled);
-    void setPriority(int priority);
+    Q_REVISION(13) void setPriority(int priority);
 
 Q_SIGNALS:
     void pressed(Qt3DRender::QPickEvent *pick);
@@ -88,7 +88,7 @@ Q_SIGNALS:
     void dragEnabledChanged(bool dragEnabled);
     void pressedChanged(bool pressed);
     void containsMouseChanged(bool containsMouse);
-    void priorityChanged(int priority);
+    Q_REVISION(13) void priorityChanged(int priority);
 
 protected:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
diff --git a/src/render/texture/qabstracttexture.cpp b/src/render/texture/qabstracttexture.cpp
index 5b11243c4..6ef912320 100644
--- a/src/render/texture/qabstracttexture.cpp
+++ b/src/render/texture/qabstracttexture.cpp
@@ -937,7 +937,7 @@ QTextureGeneratorPtr QAbstractTexture::dataGenerator() const
 
 /*!
  * \return the current texture handle type.
- * \since 5.12
+ * \since 5.13
  */
 QAbstractTexture::HandleType QAbstractTexture::handleType() const
 {
@@ -964,7 +964,7 @@ QAbstractTexture::HandleType QAbstractTexture::handleType() const
  * \return the current texture handle, if Qt 3D is using the OpenGL renderer,
  * handle is a texture id integer.
  *
- * \since 5.12
+ * \since 5.13
  */
 QVariant QAbstractTexture::handle() const
 {
diff --git a/src/render/texture/qabstracttexture.h b/src/render/texture/qabstracttexture.h
index e6833ffb4..40953f253 100644
--- a/src/render/texture/qabstracttexture.h
+++ b/src/render/texture/qabstracttexture.h
@@ -337,8 +337,8 @@ Q_SIGNALS:
     void comparisonModeChanged(ComparisonMode comparisonMode);
     void layersChanged(int layers);
     void samplesChanged(int samples);
-    void handleTypeChanged(HandleType handleType);
-    void handleChanged(QVariant handle);
+    Q_REVISION(13) void handleTypeChanged(HandleType handleType);
+    Q_REVISION(13) void handleChanged(QVariant handle);
 
 protected:
     explicit QAbstractTexture(Qt3DCore::QNode *parent = nullptr);