diff options
author | Mike Krus <mike.krus@kdab.com> | 2020-02-07 18:08:29 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2020-02-07 18:10:43 +0000 |
commit | b0eb152b82cdd9658154ff7d9ef9e764eccc1ebd (patch) | |
tree | d754ad4412d5c1d26caedd54f2455f3e27cbbd46 /src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | |
parent | 137b0cbbc746eecc6dd6a93f9a268f8d42c96bcc (diff) | |
parent | fa6799f63f3211300705b814b97716ca689d4bfa (diff) |
Merge remote-tracking branch 5.15 into dev
Change-Id: I731aa986e1cc45b3af920db1a23f256927beecf7
Diffstat (limited to 'src/quick3d/imports/render/qt3dquick3drenderplugin.cpp')
-rw-r--r-- | src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index 947e3d2f1..e42be550d 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -119,6 +119,7 @@ #include <Qt3DRender/qnopicking.h> #include <Qt3DRender/qshaderimage.h> #include <Qt3DRender/qsubtreeenabler.h> +#include <Qt3DRender/qrendercapabilities.h> #include <QtGui/qwindow.h> @@ -169,7 +170,9 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) // Renderer setttings qmlRegisterType<Qt3DRender::QRenderSettings>(uri, 2, 0, "RenderSettings"); + qmlRegisterType<Qt3DRender::QRenderSettings, 15>(uri, 2, 15, "RenderSettings"); qmlRegisterType<Qt3DRender::QPickingSettings>(uri, 2, 0, "PickingSettings"); + qmlRegisterUncreatableType<Qt3DRender::QRenderCapabilities>(uri, 2, 15, "RenderCapabilities", "Only available as a property of RenderSettings"); // @uri Qt3D.Render Qt3DRender::Quick::registerExtendedType<Qt3DRender::QSceneLoader, Qt3DRender::Render::Quick::Quick3DScene>("QSceneLoader", "Qt3D.Render/SceneLoader", uri, 2, 0, "SceneLoader"); @@ -184,6 +187,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) Qt3DRender::Quick::registerExtendedType<Qt3DRender::QRenderPass, Qt3DRender::Render::Quick::Quick3DRenderPass>("QRenderPass", "Qt3D.Render/RenderPass", uri, 2, 0, "RenderPass"); qmlRegisterType<Qt3DRender::QShaderProgram>(uri, 2, 0, "ShaderProgram"); qmlRegisterType<Qt3DRender::QShaderProgram, 9>(uri, 2, 9, "ShaderProgram"); + qmlRegisterType<Qt3DRender::QShaderProgram, 15>(uri, 2, 15, "ShaderProgram"); qmlRegisterType<Qt3DRender::QShaderProgramBuilder>(uri, 2, 10, "ShaderProgramBuilder"); qmlRegisterType<Qt3DRender::QShaderProgramBuilder, 13>(uri, 2, 13, "ShaderProgramBuilder"); qmlRegisterUncreatableType<Qt3DRender::QShaderData>(uri, 2, 0, "QShaderData", "Quick3D should instantiate Quick3DShaderData only"); |