diff --git a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp index 017e2a453..e24ae6348 100644 --- a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp +++ b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp @@ -78,7 +78,6 @@ void Qt3DQuick3DAnimationPlugin::registerTypes(const char *uri) qmlRegisterType(uri, 2, 9, "ClipAnimator"); qmlRegisterType(uri, 2, 9, "BlendedClipAnimator"); qmlRegisterType(uri, 2, 9, "ChannelMapping"); - qmlRegisterType(uri, 2, 9, "ChannelMapping"); qmlRegisterUncreatableType(uri, 2, 9, "AbstractAnimationClip", QStringLiteral("QAbstractAnimationClip is abstract")); qmlRegisterType(uri, 2, 9, "AnimationClipLoader"); qmlRegisterType(uri, 2, 9, "AnimationClip"); diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index 9a3e76923..ce8f450f7 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -86,11 +86,11 @@ void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri) { // Framegraphs qmlRegisterType(uri, 2, 0, "ForwardRenderer"); - qmlRegisterRevision(uri, 2, 9); + qmlRegisterType(uri, 2, 9, "ForwardRenderer"); // Entities qmlRegisterType(uri, 2, 0, "SkyboxEntity"); - qmlRegisterRevision(uri, 2, 9); + qmlRegisterType(uri, 2, 9, "SkyboxEntity"); qmlRegisterType(uri, 2, 9, "LevelOfDetailLoader"); // Camera Controllers @@ -108,11 +108,11 @@ void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri) qmlRegisterType(uri, 2, 0, "PerVertexColorMaterial"); qmlRegisterType(uri, 2, 0, "GoochMaterial"); qmlRegisterType(uri, 2, 0, "TextureMaterial"); - qmlRegisterRevision(uri, 2, 10); - qmlRegisterRevision(uri, 2, 11); + qmlRegisterType(uri, 2, 10, "TextureMaterial"); + qmlRegisterType(uri, 2, 11, "TextureMaterial"); qmlRegisterType(uri, 2, 10, "DiffuseSpecularMaterial"); qmlRegisterType(uri, 2, 9, "MetalRoughMaterial"); - qmlRegisterRevision(uri, 2, 10); + qmlRegisterType(uri, 2, 10, "MetalRoughMaterial"); qmlRegisterType(uri, 2, 9, "TexturedMetalRoughMaterial"); qmlRegisterType(uri, 2, 9, "MorphPhongMaterial"); @@ -128,9 +128,9 @@ void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri) qmlRegisterType(uri, 2, 0, "CylinderMesh"); qmlRegisterType(uri, 2, 0, "CylinderGeometry"); qmlRegisterType(uri, 2, 0, "PlaneMesh"); - qmlRegisterRevision(uri, 2, 9); + qmlRegisterType(uri, 2, 9, "PlaneMesh"); qmlRegisterType(uri, 2, 0, "PlaneGeometry"); - qmlRegisterRevision(uri, 2, 9); + qmlRegisterType(uri, 2, 9, "PlaneGeometry"); qmlRegisterType(uri, 2, 0, "TorusMesh"); qmlRegisterType(uri, 2, 0, "TorusGeometry"); qmlRegisterType(uri, 2, 0, "SphereMesh"); diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index 4b30bcd2f..9b79eb9bc 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -166,7 +166,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) // @uri Qt3D.Render Qt3DRender::Quick::registerExtendedType("QSceneLoader", "Qt3D.Render/SceneLoader", uri, 2, 0, "SceneLoader"); - qmlRegisterRevision(uri, 2, 9); + qmlRegisterType(uri, 2, 9, "SceneLoader"); Qt3DRender::Quick::registerExtendedType("QEffect", "Qt3D.Render/Effect", uri, 2, 0, "Effect"); Qt3DRender::Quick::registerExtendedType("QTechnique", "Qt3D.Render/Technique", uri, 2, 0, "Technique"); qmlRegisterType(uri, 2, 0, "FilterKey"); @@ -176,7 +176,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) Qt3DRender::Quick::registerExtendedType("QMaterial", "Qt3D.Render/Material", uri, 2, 0, "Material"); Qt3DRender::Quick::registerExtendedType("QRenderPass", "Qt3D.Render/RenderPass", uri, 2, 0, "RenderPass"); qmlRegisterType(uri, 2, 0, "ShaderProgram"); - qmlRegisterRevision(uri, 2, 9); + qmlRegisterType(uri, 2, 9, "ShaderProgram"); qmlRegisterType(uri, 2, 10, "ShaderProgramBuilder"); qmlRegisterUncreatableType(uri, 2, 0, "QShaderData", "Quick3D should instantiate Quick3DShaderData only"); qmlRegisterType(uri, 2, 0, "ShaderDataArray"); @@ -184,9 +184,9 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) // Camera qmlRegisterType(uri, 2, 0, "Camera"); - qmlRegisterRevision(uri, 2, 9); + qmlRegisterType(uri, 2, 9, "Camera"); qmlRegisterType(uri, 2, 0, "CameraLens"); - qmlRegisterRevision(uri, 2, 9); + qmlRegisterType(uri, 2, 9, "CameraLens"); // Textures qmlRegisterType(uri, 2, 0, "WrapMode");//, QStringLiteral("QTextureWrapMode cannot be created from QML")); @@ -222,7 +222,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) // Picking qmlRegisterType(uri, 2, 0, "ObjectPicker"); - qmlRegisterRevision(uri, 2, 9); + qmlRegisterType(uri, 2, 9, "ObjectPicker"); qmlRegisterUncreatableType(uri, 2, 0, "PickEvent", QStringLiteral("Events cannot be created")); qmlRegisterType(uri, 2, 11, "RayCaster"); qmlRegisterType(uri, 2, 11, "ScreenRayCaster"); @@ -246,7 +246,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) Qt3DRender::Quick::registerExtendedType("QRenderPassFilter", "Qt3D.Render/RenderPassFilter", uri, 2, 0, "RenderPassFilter"); Qt3DRender::Quick::registerExtendedType("QTechniqueFilter", "Qt3D.Render/TechniqueFilter", uri, 2, 0, "TechniqueFilter"); Qt3DRender::Quick::registerExtendedType("QViewport", "Qt3D.Render/Viewport", uri, 2, 0, "Viewport"); - qmlRegisterRevision(uri, 2, 9); + qmlRegisterType(uri, 2, 9, "Viewport"); Qt3DRender::Quick::registerExtendedType("QRenderTargetSelector", "Qt3D.Render/RenderTargetSelector", uri, 2, 0, "RenderTargetSelector"); qmlRegisterType(uri, 2, 0, "ClearBuffers"); qmlRegisterType(uri, 2, 0, "FrameGraphNode"); @@ -255,7 +255,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) qmlRegisterType(uri, 2, 0, "FrustumCulling"); qmlRegisterType(uri, 2, 0, "DispatchCompute"); qmlRegisterType(uri, 2, 1, "RenderCapture"); - qmlRegisterRevision(uri, 2, 9); + qmlRegisterType(uri, 2, 9, "RenderCapture"); qmlRegisterUncreatableType(uri, 2, 1, "RenderCaptureReply", QStringLiteral("RenderCaptureReply is only instantiated by RenderCapture")); qmlRegisterType(uri, 2, 9, "BufferCapture"); Qt3DRender::Quick::registerExtendedType("QMemoryBarrier", "Qt3D.Render/MemoryBarrier", uri, 2, 9, "MemoryBarrier");